Merge remote-tracking branch 'origin/master'
authorKenneth Reitz <me@kennethreitz.com>
Mon, 15 Apr 2013 07:21:40 +0000 (03:21 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Mon, 15 Apr 2013 07:21:40 +0000 (03:21 -0400)

Trivial merge