Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Sat, 21 Jan 2012 22:48:55 +0000 (17:48 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 21 Jan 2012 22:48:55 +0000 (17:48 -0500)

Trivial merge