Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Fri, 8 Jun 2012 01:55:11 +0000 (21:55 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Fri, 8 Jun 2012 01:55:11 +0000 (21:55 -0400)

Trivial merge