diff options
author | Kim Alvefur <zash@zash.se> | 2015-05-13 22:33:40 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-05-13 22:33:40 +0200 |
commit | 539f4b561436344e095cc945afe6301edf272250 (patch) | |
tree | 158e57da633fa8d8553805dcd190a93b767d7f9a /doc/names.txt | |
parent | 70e77200f7789e9fb606c7e99e30a54aca70c5c5 (diff) | |
parent | d6a59152ea90202fa09ba8e6ba7386b68978b181 (diff) | |
download | prosody-539f4b561436344e095cc945afe6301edf272250.tar.gz prosody-539f4b561436344e095cc945afe6301edf272250.zip |
Merge 0.10->trunk
Diffstat (limited to 'doc/names.txt')
0 files changed, 0 insertions, 0 deletions