Merge pull request #1700 from kennethreitz/v2.0.1
authorKenneth Reitz <me@kennethreitz.org>
Thu, 24 Oct 2013 14:29:11 +0000 (07:29 -0700)
committerKenneth Reitz <me@kennethreitz.org>
Thu, 24 Oct 2013 14:29:11 +0000 (07:29 -0700)
v2.0.1


Trivial merge