# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1330737136 0
# Node ID a8901f59bc5363cffa9574b67ea698b9f385acbb
# Parent  ed0071f0e230b8ecef3b2edfc6491e6d65576b00# Parent  9a5de6509aa8349611c08cf38845794f64fc046e
Merge with Zash

diff -r 9a5de6509aa8 -r a8901f59bc53 Makefile
--- a/Makefile	Sat Mar 03 01:35:39 2012 +0100
+++ b/Makefile	Sat Mar 03 01:12:16 2012 +0000
@@ -33,6 +33,7 @@
 	install -d $(SOURCE)/util/sasl
 	install -m644 util/sasl/* $(SOURCE)/util/sasl
 	install -m644 plugins/*.lua $(MODULES)
+	install -m644 plugins/s2s/*.lua $(MODULES)
 	install -d $(MODULES)/muc
 	install -m644 plugins/muc/* $(MODULES)/muc
 	install -m644 certs/* $(CONFIG)/certs