diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-05-18 23:29:44 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-05-18 23:29:44 +0100 |
commit | 5bc54ac5ead9dd0ad1bfeabf5a67259c4dc37275 (patch) | |
tree | cd5248386c77d045a91e6590f83e18018d2516ac /prosody.cfg.lua.dist | |
parent | 939a59f26a5f5be6df6d39334879a8f46f1bc716 (diff) | |
parent | 8aa6c5fbd3217d15753f3102cdb3189140a341cf (diff) | |
download | prosody-5bc54ac5ead9dd0ad1bfeabf5a67259c4dc37275.tar.gz prosody-5bc54ac5ead9dd0ad1bfeabf5a67259c4dc37275.zip |
Merge 0.7->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions