[Pkg-javascript-commits] [json-js] 16/18: Merge tag 'upstream/0_20160510'

[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 39ac672d3b1fcfd18e917962967ee68b79ae07da
Merge: a7fa788 37d67e1
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Aug 31 11:44:18 2016 +0200

    Merge tag 'upstream/0_20160510'
    
    Upstream version 0~20160510
    
    # gpg: Underskrift lavet ons 31 aug 2016 11:44:12 CEST med RSA nøgle-id 2C7C3146C1A00121
    # gpg: God underskrift fra »Jonas Smedegaard <dr at jones.dk>« [ultimativ]
    # gpg:        også kendt som »Jonas Smedegaard <js at debian.org>« [ultimativ]
    # gpg:        også kendt som »Jonas Smedegaard <jonas at homebase.dk>« [ultimativ]
    # gpg:        også kendt som »[jpeg image of size 4165]« [ultimativ]

 cycle.js            | 134 +++++++-------
 json2.js            | 507 +++++++++++++++++++++++++---------------------------
 json_parse.js       | 368 +++++++++++++++++++-------------------
 json_parse_state.js | 398 +++++++++++++++++++++--------------------
 4 files changed, 704 insertions(+), 703 deletions(-)

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