Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Fri, 15 Jun 2012 18:31:24 +0000 (14:31 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Fri, 15 Jun 2012 18:31:24 +0000 (14:31 -0400)

Trivial merge