diff options
author | Matthew Wild <mwild1@gmail.com> | 2009-03-03 17:18:43 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2009-03-03 17:18:43 +0000 |
commit | 3d1e8c5ab3d7417d10199545a757b1ec2c5df83c (patch) | |
tree | 45036a478086aff40557982433574d35781631d8 /doc/names.txt | |
parent | 7a7a89844a038b071f02fd1af309ba9ebbcda7de (diff) | |
parent | fa16fb21e674614029fb3ed2d1445bba9b058d03 (diff) | |
download | prosody-3d1e8c5ab3d7417d10199545a757b1ec2c5df83c.tar.gz prosody-3d1e8c5ab3d7417d10199545a757b1ec2c5df83c.zip |
Automated merge with http://luaetta.ath.cx:1234/
Diffstat (limited to 'doc/names.txt')
0 files changed, 0 insertions, 0 deletions