Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Fri, 12 Oct 2012 23:45:20 +0000 (00:45 +0100)
committerKenneth Reitz <me@kennethreitz.com>
Fri, 12 Oct 2012 23:45:20 +0000 (00:45 +0100)

Trivial merge