Merge 0.10->trunk

author: Kim Alvefur <zash@zash.se>
date: Sun, 10 Jan 2016 03:57:17 +0100
parent: 7071:d9e620adfb64
child: 7165:f0e6757261bc
--- a/Makefile	Fri Jan 08 16:21:05 2016 +0100
+++ b/Makefile	Sun Jan 10 03:57:17 2016 +0100
@@ -52,6 +52,9 @@
 	rm -f prosody.version
 	$(MAKE) clean -C util-src
 
+test:
+	cd tests && ./run_tests.sh
+
 util/%.so:
 	$(MAKE) install -C util-src