Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Fri, 23 Dec 2011 22:24:34 +0000 (17:24 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Fri, 23 Dec 2011 22:24:34 +0000 (17:24 -0500)

Trivial merge