Merge branch 'release/0.2.3' into develop
authorKenneth Reitz <me@kennethreitz.com>
Tue, 15 Feb 2011 14:46:58 +0000 (09:46 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Tue, 15 Feb 2011 14:46:58 +0000 (09:46 -0500)

Trivial merge