diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-06-09 01:11:12 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-06-09 01:11:12 +0100 |
commit | 061df0df373dc555e0b9e4c9c6ca022f3905f9de (patch) | |
tree | 026f9f66b877f2868515a023775c5fccfdc68fb6 /tools/xep227toprosody.lua | |
parent | 1357c719b98ae25b8cc593005371d59dc5182c4d (diff) | |
parent | 8736c7f83f55f7b2b8c7c74ac7f9af14254a7f80 (diff) | |
download | prosody-061df0df373dc555e0b9e4c9c6ca022f3905f9de.tar.gz prosody-061df0df373dc555e0b9e4c9c6ca022f3905f9de.zip |
Merge 0.7->trunk
Diffstat (limited to 'tools/xep227toprosody.lua')
-rwxr-xr-x[-rw-r--r--] | tools/xep227toprosody.lua | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/tools/xep227toprosody.lua b/tools/xep227toprosody.lua index 313b2194..313b2194 100644..100755 --- a/tools/xep227toprosody.lua +++ b/tools/xep227toprosody.lua |