diff options
author | Tobias Markmann <tm@ayena.de> | 2010-03-12 18:41:05 +0100 |
---|---|---|
committer | Tobias Markmann <tm@ayena.de> | 2010-03-12 18:41:05 +0100 |
commit | b05ccd7b3affed026faf4b492d91af972f5ae8ac (patch) | |
tree | 9dd7b38690fed8b235977def984797ba62ac50c7 /doc/names.txt | |
parent | 3a972b1742c28b7ef9cb5f76ed3bc69f752b5899 (diff) | |
parent | 456cd9c62a173637f18d2c613e3514919369ad90 (diff) | |
download | prosody-b05ccd7b3affed026faf4b492d91af972f5ae8ac.tar.gz prosody-b05ccd7b3affed026faf4b492d91af972f5ae8ac.zip |
Merge with tip.
Diffstat (limited to 'doc/names.txt')
0 files changed, 0 insertions, 0 deletions