Merge remote-tracking branch 'origin/master'
authorKenneth Reitz <me@kennethreitz.com>
Tue, 21 May 2013 21:27:15 +0000 (17:27 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Tue, 21 May 2013 21:27:15 +0000 (17:27 -0400)

Trivial merge