# HG changeset patch # User Waqas Hussain # Date 1298211704 -18000 # Node ID 65f22ed19b9ee63419c2acccaea87e035b627ff2 # Parent a361c578c1f2c5a9e8436ace2b7516a2d44a749a# Parent 7f119ebcf55f5aa93d659dc32e183d7a6b5fb24c Merge 0.8->trunk. diff -r a361c578c1f2 -r 65f22ed19b9e util/json.lua --- a/util/json.lua Sun Feb 20 19:16:56 2011 +0500 +++ b/util/json.lua Sun Feb 20 19:21:44 2011 +0500 @@ -268,7 +268,9 @@ return tonumber(s); end local function readmember(t) + skipstuff(); local k = readstring(); + skipstuff(); checkandskip(":"); t[k] = readvalue(); end