diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-05-05 19:01:14 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-05-05 19:01:14 +0100 |
commit | c60b80b85145981fa6bbf666c2fbd9c0578e7142 (patch) | |
tree | bcd9bfbcd3170bb426011c02470ae98b43a32d7a /AUTHORS | |
parent | 28942eed12a9d77431cf4b78814deb63356c751a (diff) | |
parent | e5267262af2f06097bdf246c4f44d5e88b2d15a8 (diff) | |
download | prosody-c60b80b85145981fa6bbf666c2fbd9c0578e7142.tar.gz prosody-c60b80b85145981fa6bbf666c2fbd9c0578e7142.zip |
Merge configmanager->trunk
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions