aboutsummaryrefslogtreecommitdiffstats
path: root/util/import.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-12-31 19:09:34 +0100
committerKim Alvefur <zash@zash.se>2013-12-31 19:09:34 +0100
commit524a2f832d394c4f46eaeba0516a9916ec02ae8b (patch)
tree1bd9bf4c41dcfba42c26fece5df37138185b774f /util/import.lua
parent29d3c27219e71e8f2ed0c835bb83333ca5ce9fbc (diff)
parent5151038c3ad784af74fcc0bf7da8a089ae459b0f (diff)
downloadprosody-524a2f832d394c4f46eaeba0516a9916ec02ae8b.tar.gz
prosody-524a2f832d394c4f46eaeba0516a9916ec02ae8b.zip
Merge 0.10->trunk and Happy New Year!
Diffstat (limited to 'util/import.lua')
0 files changed, 0 insertions, 0 deletions