Merge branch '1.2'

Author: wouterj

composer.json

@@ -16,7 +16,7 @@
         "doctrine/common": "~2.4",
         "doctrine/doctrine-bundle": "~1.0",
         "doctrine/phpcr-odm": "~1.0",
-        "doctrine/phpcr-bundle": "~1.0,>=1.0.0-beta2",
+        "doctrine/phpcr-bundle": "~1.1,>=1.1.0-beta2",
         "doctrine/data-fixtures": "~1.0",
         "jackalope/jackalope": "~1.1,>=1.1.5",
         "jackalope/jackalope-doctrine-dbal": "~1.1,>=1.1.0"