- Merge devel-framework branch, resolved conflicts

alecpl

2012-04-13 0c259682f65eaaf23ea4ccb56a706d6baf3007e4

 program/include/clisetup.php

@@ -55,7 +55,7 @@
         continue;

      $args[$key] = preg_replace(array('/^["\']/', '/["\']$/'), '', $value);
		

      if ($alias = $aliases[$key])
         $args[$alias] = $args[$key];
   }