Merge pull request #1713 from daftshady/master
authorKenneth Reitz <me@kennethreitz.org>
Wed, 4 Dec 2013 01:33:33 +0000 (17:33 -0800)
committerKenneth Reitz <me@kennethreitz.org>
Wed, 4 Dec 2013 01:33:33 +0000 (17:33 -0800)
Fixed #1711


Trivial merge