Merge pull request #580 from slingamn/keepalive
authorKenneth Reitz <me@kennethreitz.com>
Fri, 4 May 2012 04:33:42 +0000 (21:33 -0700)
committerKenneth Reitz <me@kennethreitz.com>
Fri, 4 May 2012 04:33:42 +0000 (21:33 -0700)
Fix and test for #458


Trivial merge