aboutsummaryrefslogtreecommitdiffstats
path: root/prosody.cfg.lua.dist
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-03-30 19:46:53 +0100
committerMatthew Wild <mwild1@gmail.com>2010-03-30 19:46:53 +0100
commit3dbf4c9e57cec2baa98f8864263a3cd11d608707 (patch)
tree8fab56c4272fd935c3e43ba0608e87e019b08bf5 /prosody.cfg.lua.dist
parentef919e14178f9526cc9c10842c8db7359055a680 (diff)
parent13c9d77ff45c8c4fed0bef6dac77d71e9b964b88 (diff)
downloadprosody-3dbf4c9e57cec2baa98f8864263a3cd11d608707.tar.gz
prosody-3dbf4c9e57cec2baa98f8864263a3cd11d608707.zip
Merge 0.7/waqas->0.7/MattJ
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions