Merge pull request #1619 from Lukasa/master
authorKenneth Reitz <me@kennethreitz.com>
Tue, 24 Sep 2013 18:31:13 +0000 (11:31 -0700)
committerKenneth Reitz <me@kennethreitz.com>
Tue, 24 Sep 2013 18:31:13 +0000 (11:31 -0700)
Up to date CL.

1  2 
HISTORY.rst

diff --cc HISTORY.rst
Simple merge