Merge remote-tracking branch 'origin/master'
authorKenneth Reitz <me@kennethreitz.com>
Thu, 17 Oct 2013 06:33:05 +0000 (02:33 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Thu, 17 Oct 2013 06:33:05 +0000 (02:33 -0400)

Trivial merge