Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Sun, 2 Sep 2012 08:50:30 +0000 (04:50 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sun, 2 Sep 2012 08:50:30 +0000 (04:50 -0400)

Trivial merge