Merge remote-tracking branch 'origin/master'
authorKenneth Reitz <me@kennethreitz.com>
Tue, 26 Mar 2013 20:32:25 +0000 (16:32 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Tue, 26 Mar 2013 20:32:25 +0000 (16:32 -0400)

Trivial merge