Merge branch 'refs/heads/update-guzzle'

cboden · cboden · commit 6d2b06f18200 · 2012-11-10T15:17:27.000-05:00
Conflicts:
	CHANGELOG.md
diff --git a/composer.json b/composer.json
@@ -5,8 +5,8 @@
     "license": "MIT",
     "require": {
         "php": ">=5.3.3",
-        "guzzle/http": "2.8.*",
-        "guzzle/parser": "2.8.*",
+        "guzzle/http": "3.0.*",
+        "guzzle/parser": "3.0.*",
         "react/socket": "0.2.*"
     },
     "autoload": {
