# HG changeset patch # User Matthew Wild # Date 1298511647 0 # Node ID 1033729a246793ea7fd47b5ef8bf88870ce87bdb # Parent 4919831b5b560490ccc124d904632a97950b645a# Parent 7f119ebcf55f5aa93d659dc32e183d7a6b5fb24c Merge with waqas diff -r 4919831b5b56 -r 1033729a2467 util/json.lua --- a/util/json.lua Sat Feb 19 02:31:06 2011 +0000 +++ b/util/json.lua Thu Feb 24 01:40:47 2011 +0000 @@ -268,7 +268,9 @@ return tonumber(s); end local function readmember(t) + skipstuff(); local k = readstring(); + skipstuff(); checkandskip(":"); t[k] = readvalue(); end