[Pkg-javascript-commits] [json-js] 73/85: Merge tag 'upstream/0_20150503'

[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 5aecad9708c26a068fc2db6c434fb71c35e621fa
Merge: 2ca5c99 11a01ba
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Mar 14 04:27:28 2016 +0100

    Merge tag 'upstream/0_20150503'
    
    Upstream version 0~20150503
    
    # gpg: Underskrift lavet man 14 mar 2016 04:27:24 CET
    # gpg:                bruger RSA nøgle 0x2C7C3146C1A00121
    # gpg: God underskrift fra »Jonas Smedegaard <dr at jones.dk>«
    # gpg:        også kendt som »Jonas Smedegaard <jonas at homebase.dk>«
    # gpg:        også kendt som »Jonas Smedegaard <js at debian.org>«
    # gpg:        også kendt som »[jpeg image of size 4165]«

 README              |  14 +-
 cycle.js            |  38 ++--
 json.js             | 529 ----------------------------------------------------
 json2.js            | 143 ++++++++------
 json_parse.js       |  33 ++--
 json_parse_state.js |  86 +++++----
 6 files changed, 174 insertions(+), 669 deletions(-)

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