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)
commit390a4ae4bc946bfd08860ab20ccde5e0e49ef711
tree0f1a796ab357fc2373dc272e2247e8d08e5a74a7
parent4889adce4e7ea6b9e89fd6059cda2dc7cdf53be8
parent29aa21a2fdd1421388c26a44ad32e55854470cf6
Merge pull request #806 from rhyselsmore/develop

General Housekeeping