Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Fri, 8 Jun 2012 02:09:16 +0000 (22:09 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Fri, 8 Jun 2012 02:09:16 +0000 (22:09 -0400)

Trivial merge