Merge pull request #1037 from sigmavirus24/master
authorKenneth Reitz <me@kennethreitz.com>
Tue, 18 Dec 2012 18:09:33 +0000 (10:09 -0800)
committerKenneth Reitz <me@kennethreitz.com>
Tue, 18 Dec 2012 18:09:33 +0000 (10:09 -0800)
Fix #1036


Trivial merge