Merge remote-tracking branch 'origin/master' into 0.3

* origin/master:
  Change react/promise constraints to use tilde operator

Conflicts:
	composer.lock
	src/React/Dns/composer.json
	src/React/Stream/composer.json

Author: igorw

composer.json

@@ -7,7 +7,7 @@
         "php": ">=5.3.2",
         "react/cache": "0.3.*",
         "react/socket": "0.3.*",
-        "react/promise": "1.0.*"
+        "react/promise": "~1.0"
     },
     "autoload": {
         "psr-0": { "React\\Dns": "" }