[Pkg-javascript-commits] [node-jsonstream] 152/214: clarify licensing

[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 8c47818fcad47f22e451e03955a485a8cdffd6b3
Author: Kyle Mitchell <kyle at kemitchell.com>
Date:   Thu May 21 07:24:37 2015 +0000

    clarify licensing
---
 package.json    | 1 +
 readme.markdown | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 501ef9a..70b1f78 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
     "type": "git",
     "url": "git://github.com/dominictarr/JSONStream.git"
   },
+  "license": "(MIT OR Apache-2.0)",
   "keywords": [
     "json",
     "stream",
diff --git a/readme.markdown b/readme.markdown
index 2c367ff..4a6531a 100644
--- a/readme.markdown
+++ b/readme.markdown
@@ -169,4 +169,4 @@ https://github.com/Floby/node-json-streams
 
 ## license
 
-MIT / APACHE2
+Dual-licensed under the MIT License or the Apache License, version 2.0

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