Merge pull request #1706 from daftshady/dev2
authorKenneth Reitz <me@kennethreitz.org>
Mon, 28 Oct 2013 17:32:21 +0000 (10:32 -0700)
committerKenneth Reitz <me@kennethreitz.org>
Mon, 28 Oct 2013 17:32:21 +0000 (10:32 -0700)
commit55ad38964b3f73d9a5c2d123a127e29040976a4b
tree06485f240a1931914907a95becb9688ae1a1a19f
parent2d5542502bdd2c122abb67a1b4901c6ddf568454
parent6931bd67153f92246c2fdd69d2c0ec29c13bb885
Merge pull request #1706 from daftshady/dev2

restoring pull request fixing #1623