[Pkg-javascript-commits] [node-read-package-json] 02/05: Merge tag 'upstream/1.2.4'

[Jérémy Lal]

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

kapouer pushed a commit to branch master
in repository node-read-package-json.

commit 8bfe13dad2f78b0b6eca161e0c9005bfcc25333f
Merge: e2af205 09b10aa
Author: Jérémy Lal <kapouer at melix.org>
Date:   Tue Jul 29 01:53:25 2014 +0200

    Merge tag 'upstream/1.2.4'
    
    Upstream version 1.2.4
    
    # gpg: Signature faite le mar. 29 juil. 2014 01:53:22 CEST avec la clef RSA d'identifiant DD39F374
    # gpg: Bonne signature de « Jérémy Lal <kapouer at melix.org> »
    # gpg:                 alias « Jérémy Lal <jerry at edagames.com> »

 .gitignore                         | 13 ++++++++++++
 package.json                       |  8 ++++----
 read-json.js                       | 41 ++++++++++++++++++++++++++++++++++----
 test/fixtures/not-json.css         |  2 +-
 test/fixtures/readmes/README       |  1 +
 test/fixtures/readmes/README.md    |  1 +
 test/fixtures/readmes/package.json |  1 +
 test/fixtures/readmes/readmexxx.yz |  1 +
 test/non-json.js                   |  3 ++-
 test/readmes.js                    | 29 +++++++++++++++++++++++++++
 10 files changed, 90 insertions(+), 10 deletions(-)

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