Merge branch 'master' into develop

johannesx75 · Mar 7, 2014 · af53349 · af53349
2 parents 7a21f05 + 57d9680
commit af53349
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -15,7 +15,8 @@
     "require": {
         "php": ">=5.3.2",
         "ext-curl": "*",
-        "guzzle/guzzle": ">=0.7"
+        "guzzle/guzzle": ">=0.7",
+        "psr/log:": "~1.0"
     },
     "require-dev": {
         "phpunit/phpunit": ">=3.7",