Merge remote-tracking branch 'origin/master'
authorKenneth Reitz <me@kennethreitz.com>
Mon, 20 May 2013 20:10:43 +0000 (16:10 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Mon, 20 May 2013 20:10:43 +0000 (16:10 -0400)

Trivial merge