Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Sat, 28 Jul 2012 20:56:49 +0000 (16:56 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 28 Jul 2012 20:56:49 +0000 (16:56 -0400)

Trivial merge