Merge remote-tracking branch 'origin/master'
authorKenneth Reitz <me@kennethreitz.com>
Mon, 16 Dec 2013 18:19:36 +0000 (13:19 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Mon, 16 Dec 2013 18:19:36 +0000 (13:19 -0500)

Trivial merge