[Pkg-javascript-commits] [json-js] 13/85: Merge commit 'upstream/0_20110315'

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository json-js.

commit 9ef7c393d9cf4a7432d532f21c86d073549195fb
Merge: 70fce15 9a3d8a8
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Apr 22 12:22:15 2011 +0200

    Merge commit 'upstream/0_20110315'

 cycle.js            | 28 +++++++++--------
 json.js             | 86 +++++++++++++++++++++++++----------------------------
 json2.js            | 71 +++++++++++++++++++++----------------------
 json_parse.js       |  9 +++---
 json_parse_state.js |  9 +++---
 5 files changed, 101 insertions(+), 102 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/json-js.git