Merge remote-tracking branch 'origin/master' v1.2.2
authorKenneth Reitz <me@kennethreitz.com>
Tue, 21 May 2013 21:43:53 +0000 (17:43 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Tue, 21 May 2013 21:43:53 +0000 (17:43 -0400)

Trivial merge