aboutsummaryrefslogtreecommitdiffstats
path: root/util/import.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-06-12 11:21:25 +0100
committerMatthew Wild <mwild1@gmail.com>2009-06-12 11:21:25 +0100
commit6a38f3d21939c1dacdbb8b4050a4a046e25b9451 (patch)
tree20631d6ce8c2e70d6aa5f69038bfa6054edd8559 /util/import.lua
parentd0d6966f9d8f0f3dbb6a04de3bcf6d8ab41f593f (diff)
parent12d17990b6ab12e8244f1f01ddad7f4528023b61 (diff)
downloadprosody-6a38f3d21939c1dacdbb8b4050a4a046e25b9451.tar.gz
prosody-6a38f3d21939c1dacdbb8b4050a4a046e25b9451.zip
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'util/import.lua')
0 files changed, 0 insertions, 0 deletions