projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge 0.9->trunk
[prosody.git]
/
tools
/
ejabberd2prosody.lua
diff --git
a/tools/ejabberd2prosody.lua
b/tools/ejabberd2prosody.lua
index ff3004c273e9f32caa012f0d961efc49af93aafe..0a6736d782b11e52389a25cc4fd26dea21ef3301 100755
(executable)
--- a/
tools/ejabberd2prosody.lua
+++ b/
tools/ejabberd2prosody.lua
@@
-2,7
+2,7
@@
-- Prosody IM
-- 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.
--