Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Mon, 20 Aug 2012 14:55:31 +0000 (00:55 +1000)
committerKenneth Reitz <me@kennethreitz.com>
Mon, 20 Aug 2012 14:55:31 +0000 (00:55 +1000)

Trivial merge