Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Fri, 21 Sep 2012 22:22:18 +0000 (15:22 -0700)
committerKenneth Reitz <me@kennethreitz.com>
Fri, 21 Sep 2012 22:22:18 +0000 (15:22 -0700)

Trivial merge