Merge 0.10->trunk

author: Matthew Wild <mwild1@gmail.com>
date: Sat, 05 Mar 2016 20:50:17 +0000
parent: 7237:472736b583fb
child: 7680:47be42c9eea3
--- a/Makefile	Fri Mar 04 22:28:15 2016 +0000
+++ b/Makefile	Sat Mar 05 20:50:17 2016 +0000
@@ -54,6 +54,7 @@
 
 test:
 	cd tests && $(RUNWITH) test.lua 0
+	# Skipping: cd tests && RUNWITH=$(RUNWITH) ./test_util_json.sh
 
 util/%.so:
 	$(MAKE) install -C util-src