Merge remote-tracking branch 'origin/master'
authorKenneth Reitz <me@kennethreitz.com>
Thu, 5 Dec 2013 22:45:05 +0000 (17:45 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Thu, 5 Dec 2013 22:45:05 +0000 (17:45 -0500)

Trivial merge