Merge branch '1.2'

Author: wouterj

composer.json

@@ -15,7 +15,7 @@
         "symfony/monolog-bundle": "~2.1",
         "doctrine/common": "~2.4",
         "doctrine/doctrine-bundle": "~1.0",
-        "doctrine/phpcr-odm": "~1.0",
+        "doctrine/phpcr-odm": "~1.1,>=1.1.0-beta2",
         "doctrine/phpcr-bundle": "~1.1,>=1.1.0-beta2",
         "doctrine/data-fixtures": "~1.0",
         "jackalope/jackalope": "~1.1,>=1.1.5",