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

[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 4df448ab36fb0a0bbb9e8cc6a5bef31046045b96
Merge: 8e6534f 965168f
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Jun 22 21:28:38 2012 +0200

    Merge tag 'upstream/0_20120621'
    
    Upstream version 0~20120621
    # gpg: Signature made fre 22 jun 2012 21:28:37 CEST using RSA key ID C1A00121
    # gpg: please do a --check-trustdb
    # gpg: Good signature from "Jonas Smedegaard <dr at jones.dk>"
    # gpg:                 aka "Jonas Smedegaard <jonas at homebase.dk>"
    # gpg:                 aka "Jonas Smedegaard <js at debian.org>"
    # gpg:                 aka "Jonas Smedegaard <jonas at dgi-huset.dk>"
    # gpg:                 aka "Jonas Smedegaard <jonas at 107b.dk>"
    # gpg:                 aka "[jpeg image of size 4165]"

 json_parse.js       | 33 ++++++++++++++++++---------------
 json_parse_state.js |  4 ++--
 2 files changed, 20 insertions(+), 17 deletions(-)

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