diff options
author | Kim Alvefur <zash@zash.se> | 2014-05-24 01:27:09 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-05-24 01:27:09 +0200 |
commit | 584982206dcd97ea12c23f793e1403d0794fc4b6 (patch) | |
tree | b9f0454fc3db32381d1c334264a070d920ece848 /doc/names.txt | |
parent | 352fc4fcb0284d81ccd617cdf7d4aa1d66b8f507 (diff) | |
parent | 55756cdd3c6a37184a13ba3ea405f1842739d177 (diff) | |
download | prosody-584982206dcd97ea12c23f793e1403d0794fc4b6.tar.gz prosody-584982206dcd97ea12c23f793e1403d0794fc4b6.zip |
Merge 0.10->trunk
Diffstat (limited to 'doc/names.txt')
0 files changed, 0 insertions, 0 deletions