Merge pull request #559 from barberj/issue_526
authorKenneth Reitz <me@kennethreitz.com>
Tue, 8 May 2012 04:58:20 +0000 (21:58 -0700)
committerKenneth Reitz <me@kennethreitz.com>
Tue, 8 May 2012 04:58:20 +0000 (21:58 -0700)
Issue #526


Trivial merge