Merge pull request #1667 from Lukasa/json2
authorKenneth Reitz <me@kennethreitz.org>
Sat, 12 Oct 2013 21:15:30 +0000 (14:15 -0700)
committerKenneth Reitz <me@kennethreitz.org>
Sat, 12 Oct 2013 21:15:30 +0000 (14:15 -0700)
Second time lucky for json related fixes.


Trivial merge