Merge branch 'master' of https://github.com/andres-montanez/Magallanes

Conflicts:
	Mage/Task/Factory.php

Mage/Command/BuiltIn/DeployCommand.php

@@ -310,7 +310,11 @@ class DeployCommand extends AbstractCommand implements RequiresEnvironment
     			    case 'targz':
     			    	$deployStrategy = 'deployment/strategy/tar-gz';
     			    	break;
-
+                            
+                            case 'git-rebase':
+    			    	$deployStrategy = 'deployment/strategy/git-rebase';
+    			    	break;
+                            
     			    case 'guess':
     			    default:
     			    	if ($this->getConfig()->release('enabled', false) == true) {

Mage/Command/BuiltIn/UpgradeCommand.php

@@ -54,7 +54,7 @@ class UpgradeCommand extends AbstractCommand
         	// Check version
         	$version = json_decode(file_get_contents(self::UPGRADE));
 
-        	if ($version !== false) {
+        	if ($version !== false && $version !== null) {
         		$versionCompare = version_compare(MAGALLANES_VERSION, $version->latest);
         		if ($versionCompare == 0) {
         			Console::output('<yellow>SKIP</yellow>', 0, 1);
@@ -94,4 +94,4 @@ class UpgradeCommand extends AbstractCommand
         	}
         }
     }
-}
+}

Mage/Command/Factory.php

@@ -10,7 +10,6 @@
 
 namespace Mage\Command;
 
-use Mage\Command\AbstractCommand;
 use Mage\Config;
 use Mage\Autoload;