Merge branch 'develop' into feature/rewrite
authorKenneth Reitz <me@kennethreitz.com>
Tue, 25 Oct 2011 00:55:45 +0000 (20:55 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Tue, 25 Oct 2011 00:55:45 +0000 (20:55 -0400)

Trivial merge