Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Wed, 25 Jan 2012 16:26:08 +0000 (11:26 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Wed, 25 Jan 2012 16:26:08 +0000 (11:26 -0500)

Trivial merge