diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-02-21 16:43:55 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-02-21 16:43:55 +0000 |
commit | 3f5d58f583d2fd78ab6bcbcdf9bce239efee9652 (patch) | |
tree | e0424fa83e56b3b610d020443000306732d07635 /tools/ejabberd2prosody.lua | |
parent | 551d3cf7b732bc5c6a0ce86c8875bedf0badc39b (diff) | |
parent | 73fbe10cd67b212ebcd021913de1a754c8d8f64f (diff) | |
download | prosody-3f5d58f583d2fd78ab6bcbcdf9bce239efee9652.tar.gz prosody-3f5d58f583d2fd78ab6bcbcdf9bce239efee9652.zip |
Merge 0.7 with 0.7 with trunk \o/
Diffstat (limited to 'tools/ejabberd2prosody.lua')
0 files changed, 0 insertions, 0 deletions