aboutsummaryrefslogtreecommitdiffstats
path: root/util/import.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-12-18 18:37:38 +0100
committerKim Alvefur <zash@zash.se>2013-12-18 18:37:38 +0100
commit87ce8469aff9d28dcd58e8cc70445aa6ead376a7 (patch)
treeff403323a5c0460440dbdb9b2925628a944d04c4 /util/import.lua
parent23495e0d6370ad80f1cb2be65f348976fe8ce616 (diff)
parentece61cbae173be6abb4750578252f72c57b8eb8c (diff)
downloadprosody-87ce8469aff9d28dcd58e8cc70445aa6ead376a7.tar.gz
prosody-87ce8469aff9d28dcd58e8cc70445aa6ead376a7.zip
Merge 0.10->trunk
Diffstat (limited to 'util/import.lua')
0 files changed, 0 insertions, 0 deletions