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)
commit3f84190a7b9a98642afafd8c285f16b9af569833
tree7235518f0f22b53e86d82ee749a8e984a03c2b65
parent097121d21400a1dc958fef764eef27eab3556d79
parentbea206018211ef77955dfeb1e982bd3530b1fe60
Merge pull request #1667 from Lukasa/json2

Second time lucky for json related fixes.