Merge branch 'next' into components

docs/change-log.md

@@ -1,5 +1,23 @@
 ## Change Log
 
+[v0.1.33](/mithril/archive/v0.1.33) - maintenance
+
+### Bug Fixes:
+
+-	fix diff bug when mixing `undefined` in a tree [#524](https://github.com/lhorie/mithril.js/issues/524)
+-	fix reference to map file in package.json for cdnjs
+-	fix links in documentation
+
+---
+
+[v0.1.32](/mithril/archive/v0.1.32) - maintenance
+
+### Bug Fixes:
+
+-	fix regression caused by [#454](https://github.com/lhorie/mithril.js/issues/454)
+
+---
+
 [v0.1.31](/mithril/archive/v0.1.31) - maintenance
 
 ### News:

docs/installation.md

@@ -120,10 +120,17 @@ It includes support for the [MSX](https://github.com/insin/msx) HTML templating
 
 You can also fork the latest stable project [directly from Github](https://github.com/lhorie/mithril).
 
-If you want to use the bleeding edge version, you can [fork the development repository](https://github.com/lhorie/mithril).
-
-Note that Mithril uses the `next` branch as the stable branch, instead of `master`, because contributors usually use `master` for pull requests. Therefore, the `master` branch should be considered unstable, and should not be used.
+If you want to use the bleeding edge version, you can [fork the development repository](https://github.com/lhorie/mithril.js).
 
 Be aware that even though Mithril has tests running in a continuous integration environment, the bleeding edge version might occasionally break. If you're interested in helping improve Mithril, you're welcome to use the bleeding edge version and report any bugs that you find.
 
 In order to update a forked version of Mithril, [follow the instructions on this page](https://help.github.com/articles/syncing-a-fork).
+
+#### Using bleeding edge from NPM
+
+To use the bleeding edge version from npm, use the following command:
+
+```
+npm install git://github.com/lhorie/mithril.js/tarball/next --save
+```
+

docs/layout/package.json

@@ -7,5 +7,5 @@
 	"repository": {"type": "git", "url": "https://github.com/lhorie/mithril"},
 	"main": "mithril.js",
 	"licenses": [{"type": "MIT", "url": "http://opensource.org/licenses/MIT"}],
-	"files": ["mithril.min.js", "mithril.min.map", "mithril.js", "README.*"]
+	"files": ["mithril.min.js", "mithril.min.js.map", "mithril.js", "README.*"]
 }