Merge branch 'develop'
authorKenneth Reitz <me@kennethreitz.com>
Wed, 17 Aug 2011 08:33:34 +0000 (04:33 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Wed, 17 Aug 2011 08:33:34 +0000 (04:33 -0400)

Trivial merge