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

[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 53fd4eb9b9e9ac9ade3d61533044986308b8d626
Merge: 2bfbc9f 7f6bc70
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Mar 25 13:22:55 2012 +0200

    Merge tag 'upstream/0_20120322'
    
    Upstream version 0~20120322
    # gpg: Signature made søn 25 mar 2012 13:22:54 CEST using RSA key ID C1A00121
    # 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]"

 README              | 12 ++++++------
 json2.js            |  2 +-
 json_parse.js       |  2 +-
 json_parse_state.js |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

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