Merge branch 'feature/httpbin' into develop
authorKenneth Reitz <me@kennethreitz.com>
Sat, 15 Oct 2011 15:56:20 +0000 (11:56 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 15 Oct 2011 15:56:20 +0000 (11:56 -0400)

Trivial merge