Merge pull request #1117 from sigmavirus24/issue1106
authorKenneth Reitz <me@kennethreitz.com>
Wed, 23 Jan 2013 02:48:31 +0000 (18:48 -0800)
committerKenneth Reitz <me@kennethreitz.com>
Wed, 23 Jan 2013 02:48:31 +0000 (18:48 -0800)
Fix #1106


Trivial merge