diff options
| author | Kim Alvefur <zash@zash.se> | 2014-09-28 01:56:22 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-09-28 01:56:22 +0200 |
| commit | b0190726e5b46b3accb081366c921839b8ee2441 (patch) | |
| tree | cfaf4c445383819dc32ada72c88e3f18079d9b30 /doc/names.txt | |
| parent | 865f1b1e8f99ab70c45cb2a4f94df34a2cb190ea (diff) | |
| parent | bf317774d921f17f73443b59008970a68f756082 (diff) | |
| download | prosody-b0190726e5b46b3accb081366c921839b8ee2441.tar.gz prosody-b0190726e5b46b3accb081366c921839b8ee2441.zip | |
Merge 0.10->trunk
Diffstat (limited to 'doc/names.txt')
0 files changed, 0 insertions, 0 deletions