Merge pull request #1283 from sigmavirus24/master
authorKenneth Reitz <me@kennethreitz.com>
Thu, 4 Apr 2013 01:04:40 +0000 (18:04 -0700)
committerKenneth Reitz <me@kennethreitz.com>
Thu, 4 Apr 2013 01:04:40 +0000 (18:04 -0700)
Closes #1280


Trivial merge