diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-07-02 17:44:14 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-07-02 17:44:14 +0100 |
commit | f654c430081b0161e66e28c70e6da80a5da99250 (patch) | |
tree | 27fb0b62bf1c29b28376fe4ff61f372f4381bdb1 /prosody.cfg.lua.dist | |
parent | 1309f761cb42ad3502fda993efaf56cb3dca3860 (diff) | |
parent | e563e751d0f7293ebd22cc9d8896c6cd041c1bf6 (diff) | |
download | prosody-f654c430081b0161e66e28c70e6da80a5da99250.tar.gz prosody-f654c430081b0161e66e28c70e6da80a5da99250.zip |
Merge 0.7->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions