aboutsummaryrefslogtreecommitdiffstats
path: root/tools/ejabberd2prosody.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-03-22 17:26:12 +0000
committerMatthew Wild <mwild1@gmail.com>2010-03-22 17:26:12 +0000
commite9210ce2e777ed966cc4e80df96582e84d0d2ae8 (patch)
tree9a36c6329eb70d4e655dc88742cea8419f06f9c3 /tools/ejabberd2prosody.lua
parent2c597f0fa443131956fd7e9d3ad86774f1dd7c7b (diff)
parent46c0b8c7f9adeeef3e0a22204879d82230ce3d5b (diff)
downloadprosody-e9210ce2e777ed966cc4e80df96582e84d0d2ae8.tar.gz
prosody-e9210ce2e777ed966cc4e80df96582e84d0d2ae8.zip
Merge 0.7->trunk
Diffstat (limited to 'tools/ejabberd2prosody.lua')
-rwxr-xr-xtools/ejabberd2prosody.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/ejabberd2prosody.lua b/tools/ejabberd2prosody.lua
index d0c22df7..d44c929b 100755
--- a/tools/ejabberd2prosody.lua
+++ b/tools/ejabberd2prosody.lua
@@ -1,7 +1,7 @@
#!/usr/bin/env lua
-- 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.