Merge pull request #1295 from sigmavirus24/issue1293
authorKenneth Reitz <me@kennethreitz.com>
Sun, 7 Apr 2013 00:27:23 +0000 (17:27 -0700)
committerKenneth Reitz <me@kennethreitz.com>
Sun, 7 Apr 2013 00:27:23 +0000 (17:27 -0700)
Fix #1293


Trivial merge