[Pkg-javascript-commits] [node-jsonstream] 136/214: Merge branch 'memory-leak'

[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 0f76de2bb3ec7cf29e9a622e9063bfa968ca9ea1
Merge: a45e9ee fe97869
Author: Dominic Tarr <dominic.tarr at gmail.com>
Date:   Mon Mar 9 21:13:18 2015 +1300

    Merge branch 'memory-leak'
    
    Conflicts:
      package.json

 index.js                                | 9 ++++++++-
 test/{ => disabled}/doubledot1.js       | 0
 test/{ => disabled}/doubledot2.js       | 0
 test/{ => disabled}/multiple_objects.js | 0
 4 files changed, 8 insertions(+), 1 deletion(-)


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