Merge branch 'release/3.1.2-5'

evanvosberg · evanvosberg · commit 8d4a2d3de4d0 · 2014-07-02T21:37:06.000+02:00
diff --git a/README.md b/README.md
@@ -49,3 +49,28 @@ require("crypto-js", function (CryptoJS) {
 ## API
 
 See: https://code.google.com/p/crypto-js
+
+## License
+
+[The MIT License (MIT)](http://opensource.org/licenses/MIT)
+
+Copyright (c) 2009-2013 Jeff Mott  
+Copyright (c) 2013-2014 Evan Vosberg
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/build/crypto-js.tar.gz b/build/crypto-js.tar.gz
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
 	"name": "crypto-js",
 	"title": "crypto-js",
 	"description": "Modularized port of googlecode project crypto-js.",
-	"version": "3.1.2-4",
+	"version": "3.1.2-5",
 	"homepage": "http://github.com/evanvosberg/crypto-js",
 	"author": {
 		"name": "Evan Vosberg",
@@ -16,8 +16,8 @@
 		"url": "http://github.com/evanvosberg/crypto-js/issues"
 	},
 	"licenses": [{
-		"type": "New BSD",
-		"url": "http://opensource.org/licenses/BSD-3-Clause"
+		"type": "MIT",
+		"url": "http://opensource.org/licenses/MIT"
 	}],
 	"dependencies": {
 
