Merge branch 'master' into loop-libev

* master:
  Fix CHANGELOG indentation
  Fix branch aliases of subtree splits to be 0.2-dev
  [Http] Correctly emit end event for Request
  [Http] Correctly emit close event in response
  Add guzzle deps update to CHANGELOG
  Update guzzle dependencies to 3.0.*
  [Http] Make response forward drain events from the connection
  Rename $resolver to $dns in examples
  Add new test-memory script that only tests the loop

Conflicts:
	CHANGELOG.md
	composer.lock

Author: igorw

composer.json

@@ -16,7 +16,7 @@
     "target-dir": "React/EventLoop",
     "extra": {
         "branch-alias": {
-            "dev-master": "0.2"
+            "dev-master": "0.2-dev"
         }
     }
 }