Merge pull request #1080 from sigmavirus24/master
authorKenneth Reitz <me@kennethreitz.com>
Mon, 7 Jan 2013 18:42:30 +0000 (10:42 -0800)
committerKenneth Reitz <me@kennethreitz.com>
Mon, 7 Jan 2013 18:42:30 +0000 (10:42 -0800)
Fix #1079


Trivial merge