Merge remote-tracking branch 'origin/master'
authorKenneth Reitz <me@kennethreitz.com>
Sat, 20 Apr 2013 04:18:33 +0000 (00:18 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 20 Apr 2013 04:18:33 +0000 (00:18 -0400)

Trivial merge