Merge remote-tracking branch 'origin/master' v2.0
authorKenneth Reitz <me@kennethreitz.com>
Tue, 24 Sep 2013 18:31:25 +0000 (14:31 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Tue, 24 Sep 2013 18:31:25 +0000 (14:31 -0400)

Trivial merge