Merge remote-tracking branch 'origin/master'
authorKenneth Reitz <me@kennethreitz.com>
Sat, 15 Dec 2012 10:50:05 +0000 (05:50 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 15 Dec 2012 10:50:05 +0000 (05:50 -0500)

Trivial merge