Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Sun, 26 Aug 2012 22:34:16 +0000 (18:34 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sun, 26 Aug 2012 22:34:16 +0000 (18:34 -0400)

Trivial merge