Merge remote-tracking branch 'origin/master'
authorKenneth Reitz <me@kennethreitz.com>
Sun, 2 Dec 2012 09:09:05 +0000 (10:09 +0100)
committerKenneth Reitz <me@kennethreitz.com>
Sun, 2 Dec 2012 09:09:05 +0000 (10:09 +0100)

Trivial merge