[Pkg-javascript-commits] [node-jsonstream] 45/214: Merge remote-tracking branch 'upstream/master' into patch-1

[Bastien Roucariès]

This is an automated email from the git hooks/post-receive script.

rouca pushed a commit to branch master
in repository node-jsonstream.

commit c27bcc092ed6c7fcc50e54b20086cdc00be83396
Merge: caef198 2455339
Author: Malte-Thorben Bruns <skenqbx at googlemail.com>
Date:   Sun Jul 15 14:08:00 2012 +0200

    Merge remote-tracking branch 'upstream/master' into patch-1

 readme.markdown | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

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