Merge branch 'master' into next

mithril.js

@@ -319,10 +319,14 @@ Mithril = m = new function app(window) {
 	
 	//model
 	m.prop = function(store) {
-		return function() {
+		var f = function() {
 			if (arguments.length) store = arguments[0]
 			return store
 		}
+		f.toJSON = function() {
+			return store
+		}
+		return f
 	}
 
 	m.deferred = function() {

tests/mithril-tests.js

@@ -419,6 +419,14 @@ function testMithril(mock) {
 		prop("foo")
 		return prop() == "foo"
 	})
+	test(function() {
+		var prop = m.prop("test")
+		return JSON.stringify(prop) == "\"test\""
+	})
+	test(function() {
+		var obj = { prop: m.prop("test") }
+		return JSON.stringify(obj) == "{\"prop\":\"test\"}"
+	})
 
 	//m.request
 	test(function() {