Merge branch 'master' of github.com:fangq/jsonlab

fangq · fangq · commit d50950cdcfc7 · 2015-01-13T15:48:18.000-05:00
Conflicts:
	examples/jsonlab_basictest.matlab
	savejson.m
diff --git a/examples/jsonlab_basictest.matlab b/examples/jsonlab_basictest.matlab
@@ -659,4 +659,4 @@ json2data =
 
     data2json: {{1x2 cell}  {1x2 cell}  {1x2 cell}}
 
->> >> >> >> 
+>> >> >> >> 
