# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1445103103 -7200
# Node ID 047becf393caaaffb513a7e1329324954c1e6b39
# Parent  0e81e3dab8960d7878643ab506d639cb48d74253# Parent  a24c9c1edd67e769242b4cd742038bd13c624a1f
Merge 0.10->trunk

diff -r 0e81e3dab896 -r 047becf393ca Makefile
--- a/Makefile	Sun Oct 11 20:03:00 2015 +0200
+++ b/Makefile	Sat Oct 17 19:31:43 2015 +0200
@@ -29,7 +29,7 @@
 	install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util
 	install -m755 ./prosody.install $(BIN)/prosody
 	install -m755 ./prosodyctl.install $(BIN)/prosodyctl
-	install -m644 core/* $(SOURCE)/core
+	install -m644 core/*.lua $(SOURCE)/core
 	install -m644 net/*.lua $(SOURCE)/net
 	install -d $(SOURCE)/net/http $(SOURCE)/net/websocket
 	install -m644 net/http/*.lua $(SOURCE)/net/http