Merge branch '1.2'

Author: wouterj

composer.json

@@ -17,7 +17,7 @@
         "doctrine/doctrine-bundle": "~1.0",
         "doctrine/phpcr-odm": "~1.1,>=1.1.0-beta2",
         "doctrine/phpcr-bundle": "~1.1,>=1.1.0-beta2",
-        "doctrine/data-fixtures": "1.*,>=1.0.0-alpha3"
+        "doctrine/data-fixtures": "1.*,>=1.0.0-alpha3",
         "jackalope/jackalope": "~1.1,>=1.1.5",
         "jackalope/jackalope-doctrine-dbal": "~1.1,>=1.1.5"
     },