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

Trivial merge