Merge remote-tracking branch 'origin/master'
authorKenneth Reitz <me@kennethreitz.com>
Mon, 24 Mar 2014 15:39:20 +0000 (11:39 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Mon, 24 Mar 2014 15:39:20 +0000 (11:39 -0400)

Trivial merge