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

[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 a20a2dea937dfa8045b0ab91588d3f34bed01bb3
Merge: c2e05fc 9170409
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Dec 23 13:25:37 2011 +0700

    Merge commit 'upstream/0_20111020'

 cycle.js | 10 +++++-----
 json.js  |  6 +++---
 json2.js | 47 +++++++++++++++++++++++++++--------------------
 3 files changed, 35 insertions(+), 28 deletions(-)

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