Merge remote-tracking branch 'origin/master'
authorKenneth Reitz <me@kennethreitz.com>
Wed, 12 Dec 2012 21:53:44 +0000 (16:53 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Wed, 12 Dec 2012 21:53:44 +0000 (16:53 -0500)

Trivial merge