Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Sat, 25 Aug 2012 14:33:42 +0000 (10:33 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 25 Aug 2012 14:33:42 +0000 (10:33 -0400)

Trivial merge