Merge pull request #1706 from daftshady/dev2
authorKenneth Reitz <me@kennethreitz.org>
Mon, 28 Oct 2013 17:32:21 +0000 (10:32 -0700)
committerKenneth Reitz <me@kennethreitz.org>
Mon, 28 Oct 2013 17:32:21 +0000 (10:32 -0700)
restoring pull request fixing #1623


Trivial merge