Merge branch 'develop' into feature/rewrite
authorKenneth Reitz <me@kennethreitz.com>
Sun, 23 Oct 2011 20:15:06 +0000 (16:15 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sun, 23 Oct 2011 20:15:06 +0000 (16:15 -0400)
1  2 
README.rst

diff --cc README.rst
Simple merge