slusarz 2006-12-15 18:20:48 PST Modified files: lib JSON.php Log: Merge from framework HEAD - 1.15 Revision Changes Path 1.5 +2 -2 imp/lib/JSON.php Chora Links: http://cvs.horde.org/diff.php/imp/lib/JSON.php?r1=1.4&r2=1.5&ty=u