Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Fri, 31 Aug 2012 06:06:21 +0000 (02:06 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Fri, 31 Aug 2012 06:06:21 +0000 (02:06 -0400)

Trivial merge