[Pkg-javascript-commits] [node-jsonstream] 165/214: Merge remote-tracking branch 'upstream/master'

[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 e101a04074c610a262fa86f2f27877a18f33ddd2
Merge: ad456c8 b89b855
Author: Guillaume Chauvet <g.chauvet at bimedia.com.fr>
Date:   Fri Aug 28 17:15:43 2015 +0200

    Merge remote-tracking branch 'upstream/master'

 package.json    | 3 ++-
 readme.markdown | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

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