[Pkg-javascript-commits] [node-strip-json-comments] 02/03: Merge tag 'upstream/1.0.4'

[Julien Puydt]

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

jpuydt-guest pushed a commit to branch master
in repository node-strip-json-comments.

commit aad498ee93f986494fca01b74dea099b8e0f66c9
Merge: 8e06482 66e2393
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Wed Aug 12 16:17:38 2015 +0200

    Merge tag 'upstream/1.0.4'
    
    Upstream version 1.0.4

 .travis.yml            |  3 +++
 cli.js                 |  4 ++--
 package.json           | 10 ++++------
 readme.md              | 10 ++++++++--
 strip-json-comments.js | 20 +++++++++++++-------
 test.js                | 25 ++++++++++++++++---------
 6 files changed, 46 insertions(+), 26 deletions(-)

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