Merge remote-tracking branch 'origin/master'
authorKenneth Reitz <me@kennethreitz.com>
Tue, 16 Jul 2013 06:20:28 +0000 (02:20 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Tue, 16 Jul 2013 06:20:28 +0000 (02:20 -0400)

Trivial merge