Merge branch 'master' of https://github.com/malteriesch/test-db-acle

Malte Riesch · Malte Riesch · commit 3e1876fc4fed · 2014-05-13T17:12:53.000+01:00
Conflicts:
	composer.json
diff --git a/composer.json b/composer.json
@@ -14,8 +14,8 @@
         
     },
     "require-dev": {
-	"mockery/mockery": "0.9.*",
         "phpunit/phpunit": "4.1.*"
+	"mockery/mockery": "0.8.*"
     },
     "autoload": {
         "psr-0": { "TestDbAcle": "lib/" },
