aboutsummaryrefslogtreecommitdiffstats
path: root/util/import.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2012-11-23 17:17:02 +0100
committerKim Alvefur <zash@zash.se>2012-11-23 17:17:02 +0100
commit7d8a4f67a2ce94a4ea70ddfbceddbb19ad0c5500 (patch)
tree493c1f07d1691e50b7e113a42783bd3baed96acb /util/import.lua
parent6896ddaea37097cf8252f94750f3a57c29ded584 (diff)
parentd5176c487ce843f40d85a2d90b300c34c6bca1ef (diff)
downloadprosody-7d8a4f67a2ce94a4ea70ddfbceddbb19ad0c5500.tar.gz
prosody-7d8a4f67a2ce94a4ea70ddfbceddbb19ad0c5500.zip
Merge 0.9->trunk
Diffstat (limited to 'util/import.lua')
0 files changed, 0 insertions, 0 deletions