diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-10-05 12:16:28 -0400 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-10-05 12:16:28 -0400 |
commit | 4fda0169d29af6047dd71840f879ee38e9c23878 (patch) | |
tree | 9344408f15cd0951aad0c621076ac09fb81d539a /prosody.cfg.lua.dist | |
parent | df8b4c6f4d2e853a146ca8f978b69f614de30105 (diff) | |
parent | 45490a4215a96c8745da04255738c67438705203 (diff) | |
download | prosody-4fda0169d29af6047dd71840f879ee38e9c23878.tar.gz prosody-4fda0169d29af6047dd71840f879ee38e9c23878.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions