Merge pull request #758 from volker48/develop
authorKenneth Reitz <me@kennethreitz.com>
Sat, 4 Aug 2012 15:39:25 +0000 (08:39 -0700)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 4 Aug 2012 15:39:25 +0000 (08:39 -0700)
Develop


Trivial merge