Require PHP 5.4.0 as a minimum
Clean up annoying 5.3 $that = $this
Remove horribly annoying 5.3 StreamInterface extends bug

This was needed because you could not implement two interfaces with a
shared method. In 5.3.8+ it is fixed, so the hack is no longer needed in
5.4.0+.
Add 5.4 to CHANGELOG
Remove $that craziness from SecureConnector
Remove PHP 5.3 from travis builds
Move to 0.4.0 section in CHANGELOG
Merge pull request #176 from reactphp/php54

Bump version to PHP 5.4, remove 5.3 specific hacks
Drop unused http-client Response::getBody()
Merge branch '0.4' into drop-get-body

* 0.4:
  Move to 0.4.0 section in CHANGELOG
  Remove PHP 5.3 from travis builds
  Remove $that craziness from SecureConnector
  Add 5.4 to CHANGELOG
  Remove horribly annoying 5.3 StreamInterface extends bug
  Clean up annoying 5.3 $that = $this
  Require PHP 5.4.0 as a minimum

Conflicts:
	CHANGELOG.md
Merge pull request #185 from reactphp/drop-get-body

Drop unused http-client Response::getBody()
Use fread() instead of socket_recv_from()
Merge branch 'fix-connection-fread' of https://github.com/clue/react into clue-fix-connection-fread
Merge branch 'refs/heads/master' into 0.4

Conflicts:
	CHANGELOG.md
Merge branch 'refs/heads/clue-fix-connection-fread' into 0.4
[Dns] Correctly resolve CNAME aliases
Fix @covers annotation
Merge branch 'dns-cname' into 0.4

* dns-cname:
  Fix @covers annotation
  [Dns] Correctly resolve CNAME aliases

Conflicts:
	src/React/Dns/Resolver/Resolver.php
Fix CHANGELOG formatting
Merge branch 'refs/heads/master' into 0.4