diff options
| author | Kim Alvefur <zash@zash.se> | 2016-02-22 18:46:59 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-02-22 18:46:59 +0100 |
| commit | 349f3e7a755249a16acf5417f9bea95c0df77513 (patch) | |
| tree | 15d7151c2609ac821e0dd08e27f67795300b090d /doc/names.txt | |
| parent | 82a913c6816be2b0503368afac85b8b20335db0e (diff) | |
| parent | 6ee4f6f618ee4a07f3b25f38c7da675d68fdceee (diff) | |
| download | prosody-349f3e7a755249a16acf5417f9bea95c0df77513.tar.gz prosody-349f3e7a755249a16acf5417f9bea95c0df77513.zip | |
Merge 0.10->trunk
Diffstat (limited to 'doc/names.txt')
0 files changed, 0 insertions, 0 deletions