diff options
author | Kim Alvefur <zash@zash.se> | 2014-06-30 13:11:01 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-06-30 13:11:01 +0200 |
commit | 7dd5829ef95b16d62e45a7cfec5986b023342670 (patch) | |
tree | 797403783259bad9e629c25caf71f8f832d36f76 /util/adhoc.lua | |
parent | 0226460cacd55adf96cb46f57f6a010181f445c5 (diff) | |
parent | d2e295445184a7fed98f158968e509b1258d3868 (diff) | |
download | prosody-7dd5829ef95b16d62e45a7cfec5986b023342670.tar.gz prosody-7dd5829ef95b16d62e45a7cfec5986b023342670.zip |
Merge 0.9->0.10
Diffstat (limited to 'util/adhoc.lua')
0 files changed, 0 insertions, 0 deletions