Merge remote-tracking branch 'origin/master'
authorKenneth Reitz <me@kennethreitz.com>
Mon, 4 Mar 2013 22:54:32 +0000 (17:54 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Mon, 4 Mar 2013 22:54:32 +0000 (17:54 -0500)

Trivial merge