Merge pull request #684 from stof/patch-1

Changed the composer constraint to allow Common 2.5

composer.json

@@ -13,10 +13,10 @@
     ],
     "require": {
         "php": ">=5.3.2",
-        "doctrine/common": "2.4.*"
+        "doctrine/common": ">=2.4,<2.6-dev"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.0.*",
+        "phpunit/phpunit": "4.*",
         "symfony/console": "2.*"
     },
     "suggest": {