Merge branch 'refs/heads/master' into 0.4

Conflicts: CHANGELOG.md
dpovshed · Jul 8, 2013 · 835e440 · 835e440
2 parents 42ac73d + b5d272a
commit 835e440
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
     "require": {
         "php": ">=5.3.3",
         "guzzle/parser": "2.8.*",
-        "react/socket": "0.3.*",
+        "react/socket-client": "0.3.*",
         "react/dns": "0.3.*"
     },
     "autoload": {