diff options
author | Kim Alvefur <zash@zash.se> | 2014-02-19 20:10:23 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-02-19 20:10:23 +0100 |
commit | 9e76e7d73a59606d756d069cc402fb1c86f34f32 (patch) | |
tree | 5110e98da3ce0b1a10fa2300eee28a6b6b566fe1 /util/prosodyctl.lua | |
parent | 08f04b1419c2c8878d3836d11cd7af806a083898 (diff) | |
parent | 1a4b32a3946e64a7d056da6ba8d1011e008fe986 (diff) | |
download | prosody-9e76e7d73a59606d756d069cc402fb1c86f34f32.tar.gz prosody-9e76e7d73a59606d756d069cc402fb1c86f34f32.zip |
Merge 0.10->trunk
Diffstat (limited to 'util/prosodyctl.lua')
0 files changed, 0 insertions, 0 deletions