Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Thu, 18 Oct 2012 05:46:12 +0000 (22:46 -0700)
committerKenneth Reitz <me@kennethreitz.com>
Thu, 18 Oct 2012 05:46:12 +0000 (22:46 -0700)

Trivial merge