diff options
author | Matthew Wild <mwild1@gmail.com> | 2015-11-17 17:12:45 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2015-11-17 17:12:45 +0000 |
commit | e4f2d5b6cd12d6f850ab39acb7a311efd9a2aaec (patch) | |
tree | 2dbe4eb578cb9b2bdffa5f395573b3f6d3a6ea39 /doc/names.txt | |
parent | 094164e5f0bf835e4fd1dcefa57f3bb4add8325d (diff) | |
parent | 3c75f782eddde40791ffab6e1156d1b7861adb00 (diff) | |
download | prosody-e4f2d5b6cd12d6f850ab39acb7a311efd9a2aaec.tar.gz prosody-e4f2d5b6cd12d6f850ab39acb7a311efd9a2aaec.zip |
Merge 0.10->trunk
Diffstat (limited to 'doc/names.txt')
0 files changed, 0 insertions, 0 deletions