aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/muc
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-03-22 17:24:55 +0000
committerMatthew Wild <mwild1@gmail.com>2010-03-22 17:24:55 +0000
commit46c0b8c7f9adeeef3e0a22204879d82230ce3d5b (patch)
tree7ec6dd56f11455527426cce6c7f6ba499df147ac /plugins/muc
parenta5c2d24d44c1e33f04bb42e59f5fb66cdf8a31ba (diff)
parent7fd387c3902484577be68c4365b8aea2e5c2dd8c (diff)
downloadprosody-46c0b8c7f9adeeef3e0a22204879d82230ce3d5b.tar.gz
prosody-46c0b8c7f9adeeef3e0a22204879d82230ce3d5b.zip
Merge 0.6->0.7
Diffstat (limited to 'plugins/muc')
-rw-r--r--plugins/muc/mod_muc.lua4
-rw-r--r--plugins/muc/muc.lib.lua4
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index d23e2474..de23aebb 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -1,6 +1,6 @@
-- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
--
-- This project is MIT/X11 licensed. Please see the
-- COPYING file in the source package for more information.
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index e6f459ae..1cc001bb 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -1,6 +1,6 @@
-- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
--
-- This project is MIT/X11 licensed. Please see the
-- COPYING file in the source package for more information.