diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-11-09 18:37:13 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-11-09 18:37:13 +0000 |
commit | 36c5b9e1e93fc4966b323dfb09d97ecf58b16eda (patch) | |
tree | e3dab93899e69c3342f06ebd3ef65bda4c11915d /doc/names.txt | |
parent | c6d12b1a102ee760b7d5a567e3346124589e29e3 (diff) | |
parent | 85289e8c7d1f592a65ba13d1c117d34cefc6e3ad (diff) | |
download | prosody-36c5b9e1e93fc4966b323dfb09d97ecf58b16eda.tar.gz prosody-36c5b9e1e93fc4966b323dfb09d97ecf58b16eda.zip |
Merge 0.10->trunk
Diffstat (limited to 'doc/names.txt')
0 files changed, 0 insertions, 0 deletions