Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Thu, 3 Nov 2011 00:39:15 +0000 (20:39 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Thu, 3 Nov 2011 00:39:15 +0000 (20:39 -0400)

Trivial merge