Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Fri, 27 Jul 2012 05:39:21 +0000 (01:39 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Fri, 27 Jul 2012 05:39:21 +0000 (01:39 -0400)

Trivial merge