# HG changeset patch # User Matthew Wild # Date 1330799252 0 # Node ID 3e77028916494eb6f428b08cb6d254a37080e617 # Parent a8901f59bc5363cffa9574b67ea698b9f385acbb# Parent 93a84314c296eeed26615ddbf9304a0477d5a136 Merge with Zash diff -r 93a84314c296 -r 3e7702891649 Makefile --- a/Makefile Sat Mar 03 16:45:34 2012 +0100 +++ b/Makefile Sat Mar 03 18:27:32 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