Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Fri, 29 Jun 2012 00:29:30 +0000 (17:29 -0700)
committerKenneth Reitz <me@kennethreitz.com>
Fri, 29 Jun 2012 00:29:30 +0000 (17:29 -0700)

Trivial merge