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->0.10
[prosody.git]
/
tools
/
ejabberd2prosody.lua
diff --git
a/tools/ejabberd2prosody.lua
b/tools/ejabberd2prosody.lua
index be1504b270c8ac7b61de062431885b519c0348a5..e9dbd2dcf601edbf241d9fc2918812c2d6257efd 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.
--