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

[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 b36cfcf5582e61a9d7c468bb50f15e38ae34b41b
Merge: 4ff19a6 9fc162e
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Dec 25 12:23:43 2011 +0700

    Merge commit 'upstream/0_20111021'


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