Merge remote-tracking branch 'origin/master'
authorKenneth Reitz <me@kennethreitz.com>
Thu, 24 Oct 2013 14:54:48 +0000 (10:54 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Thu, 24 Oct 2013 14:54:48 +0000 (10:54 -0400)

Trivial merge