Merge remote-tracking branch 'origin/master'
authorKenneth Reitz <me@kennethreitz.com>
Sat, 1 Dec 2012 15:55:14 +0000 (16:55 +0100)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 1 Dec 2012 15:55:14 +0000 (16:55 +0100)

Trivial merge