Merge remote-tracking branch 'origin/master'
authorKenneth Reitz <me@kennethreitz.com>
Tue, 15 Apr 2014 23:07:52 +0000 (19:07 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Tue, 15 Apr 2014 23:07:52 +0000 (19:07 -0400)

Trivial merge