Merge remote-tracking branch 'origin/master'
authorKenneth Reitz <me@kennethreitz.com>
Mon, 3 Sep 2012 08:06:14 +0000 (04:06 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Mon, 3 Sep 2012 08:06:14 +0000 (04:06 -0400)

Trivial merge