Include test-requirements in package (fixed #47).
Merging master into v1.3
Merge branch 'master' into release
Merge branch master into release
Version bump.
Ugh merge fail.
Merge branch 'master' of https://github.com/shazow/urllib3 into release
Merge branch master into release, with version bump.
Merge branch 'master' into release.

Preparing for v1.6.
Version bump: 1.5 -> 1.6
Merge branch 'master' into release.

2012 -> 2013.
CHANGES.
CHANGES.
Merge branch 'master' into release
CHANGES again. Messiest release merging ever.
Only invoke decoder if decode_content parameter is True. Resolve shazow/urllib#209 .
Merge pull request #219 from nipunn1313/master

Added units to the doc for timeout
Correctly set Host header when using a proxy

Fixed a bug in _set_proxy_headers that ignores the port when setting the
'Host' HTTP header while a proxy is used.
Merge pull request #217 from gavrie/master

Correctly set Host header when using a proxy
Added #217 to CHANGES