diff options
author | Matthew Wild <mwild1@gmail.com> | 2012-10-01 20:15:39 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2012-10-01 20:15:39 +0100 |
commit | 38f89dfe3fb1cff7b6f7dc873881dc439990eb33 (patch) | |
tree | ab1b1beb73f5375a5e05b02e7aed01cdb3cf512c /prosody.cfg.lua.dist | |
parent | f668985503c28905145fc31475e935e175ab2ad7 (diff) | |
parent | 39cfeeebc208a6a6b85e1e2353171c73e77c3cd7 (diff) | |
download | prosody-38f89dfe3fb1cff7b6f7dc873881dc439990eb33.tar.gz prosody-38f89dfe3fb1cff7b6f7dc873881dc439990eb33.zip |
Merge 0.9->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions