Merge branch 'develop'
authorKenneth Reitz <me@kennethreitz.com>
Tue, 15 Nov 2011 15:00:05 +0000 (10:00 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Tue, 15 Nov 2011 15:00:05 +0000 (10:00 -0500)

Trivial merge