diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-05-24 19:39:07 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-05-24 19:39:07 +0100 |
commit | e97ee0eaad41b33c15b562dadb539828e429db84 (patch) | |
tree | 2791383deb1c0f64c867a63ed82f96cddbbca552 /prosody.cfg.lua.dist | |
parent | 558778062f4d7fa6e406c243062d1fe2dd3ade9b (diff) | |
parent | 227478c80dfe7e28e2230ab8edc71d0634cb9ebf (diff) | |
download | prosody-e97ee0eaad41b33c15b562dadb539828e429db84.tar.gz prosody-e97ee0eaad41b33c15b562dadb539828e429db84.zip |
Merge trunk/Tobias->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions