diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-03-30 19:46:53 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-03-30 19:46:53 +0100 |
commit | 3dbf4c9e57cec2baa98f8864263a3cd11d608707 (patch) | |
tree | 8fab56c4272fd935c3e43ba0608e87e019b08bf5 /prosody.cfg.lua.dist | |
parent | ef919e14178f9526cc9c10842c8db7359055a680 (diff) | |
parent | 13c9d77ff45c8c4fed0bef6dac77d71e9b964b88 (diff) | |
download | prosody-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