Merge pull request #806 from rhyselsmore/develop
authorKenneth Reitz <me@kennethreitz.com>
Sat, 25 Aug 2012 04:48:30 +0000 (21:48 -0700)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 25 Aug 2012 04:48:30 +0000 (21:48 -0700)
General Housekeeping


Trivial merge