aboutsummaryrefslogtreecommitdiffstats
path: root/tests/test_core_s2smanager.lua
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 /tests/test_core_s2smanager.lua
parenta5c2d24d44c1e33f04bb42e59f5fb66cdf8a31ba (diff)
parent7fd387c3902484577be68c4365b8aea2e5c2dd8c (diff)
downloadprosody-46c0b8c7f9adeeef3e0a22204879d82230ce3d5b.tar.gz
prosody-46c0b8c7f9adeeef3e0a22204879d82230ce3d5b.zip
Merge 0.6->0.7
Diffstat (limited to 'tests/test_core_s2smanager.lua')
-rw-r--r--tests/test_core_s2smanager.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/test_core_s2smanager.lua b/tests/test_core_s2smanager.lua
index 6a7ebcd0..b49c7da6 100644
--- a/tests/test_core_s2smanager.lua
+++ b/tests/test_core_s2smanager.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.