Merge branch 'master' of https://github.com/Day8/re-frame

mike-thompson-day8 · mike-thompson-day8 · commit 3ff4625104b8 · 2015-04-16T00:05:09.000+10:00
Conflicts:
	examples/todomvc/src/todomvc/db.cljs
diff --git a/examples/todomvc/src/todomvc/db.cljs b/examples/todomvc/src/todomvc/db.cljs
@@ -23,4 +23,4 @@
 
 (defn todos->ls!
   [todos]
-  (.setItem js/localStorage lsk (str todos)))   ;; sorted-map writen as a map
+  (.setItem js/localStorage lsk (str todos)))   ;; sorted-map writen as a map
