Merge branch 'master' of github.com:magento-hackathon/magento-composer-installer

Conflicts:
	src/MagentoHackathon/Composer/Magento/Installer.php

Author: tobi-pb

composer.json

@@ -1,44 +1,47 @@
 {
-    "name": "magento-hackathon/magento-composer-installer",
-    "description": "Composer installer for Magento modules",
-    "minimum-stability": "dev",
-    "type": "composer-installer",
-    "license": "OSL-3.0",
-    "authors": [
+    "name":"magento-hackathon/magento-composer-installer",
+    "description":"Composer installer for Magento modules",
+    "minimum-stability":"dev",
+    "type":"composer-installer",
+    "license":"OSL-3.0",
+    "authors":[
         {
-            "name": "Daniel Fahlke aka Flyingmana",
-            "email": "[email protected]"
+            "name":"Daniel Fahlke aka Flyingmana",
+            "email":"[email protected]"
         },
         {
-            "name": "Jörg Weller",
-            "email": "[email protected]"
+            "name":"Jörg Weller",
+            "email":"[email protected]"
         },
         {
-            "name": "Karl Spies",
-            "email": "[email protected]"
+            "name":"Karl Spies",
+            "email":"[email protected]"
         },
         {
-            "name": "Tobias Vogt",
-            "email": "[email protected]"
+            "name":"Tobias Vogt",
+            "email":"[email protected]"
         },
         {
-            "name": "David Fuhr",
-            "email": "[email protected]"
+            "name":"David Fuhr",
+            "email":"[email protected]"
         },
         {
-            "name": "Vinai Kopp",
-            "email": "[email protected]"
+            "name":"Vinai Kopp",
+            "email":"[email protected]"
         }
     ],
-    "require": {
+    "require":{
     },
-    "require-dev": {
-        "phpunit/phpunit": "*"
+    "require-dev":{
+        "phpunit/phpunit":"*",
+        "composer/composer":"*"
     },
-    "autoload": {
-       "psr-0": {"MagentoHackathon\\Composer\\Magento": "src/"}
+    "autoload":{
+        "psr-0":{
+            "MagentoHackathon\\Composer\\Magento":"src/"
+        }
     },
-    "extra": {
-        "class": "MagentoHackathon\\Composer\\Magento\\Installer"
+    "extra":{
+        "class":"MagentoHackathon\\Composer\\Magento\\Installer"
     }
 }