Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Sat, 5 Nov 2011 01:59:16 +0000 (21:59 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 5 Nov 2011 01:59:16 +0000 (21:59 -0400)

Trivial merge