Merge pull request #686 from Lukasa/develop
authorKenneth Reitz <me@kennethreitz.com>
Tue, 19 Jun 2012 13:28:57 +0000 (06:28 -0700)
committerKenneth Reitz <me@kennethreitz.com>
Tue, 19 Jun 2012 13:28:57 +0000 (06:28 -0700)
Fix failing setup.py


Trivial merge