Merge pull request #1363 from dave-shawley/master
authorKenneth Reitz <me@kennethreitz.com>
Fri, 17 May 2013 06:23:04 +0000 (23:23 -0700)
committerKenneth Reitz <me@kennethreitz.com>
Fri, 17 May 2013 06:23:04 +0000 (23:23 -0700)
Fix for #1362


Trivial merge