diff options
author | Kim Alvefur <zash@zash.se> | 2013-04-19 14:44:08 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2013-04-19 14:44:08 +0200 |
commit | 7468a4e6be2e73122272dc88b63b931ac0fa5c0b (patch) | |
tree | 7dfc363e6ecf609a3504e70e9d87d2da74c8f49f /doc/names.txt | |
parent | bc2cf7ee1976a358b1bead2fb047e71576b66d10 (diff) | |
parent | 10e527173b98b7a479df576145e80afb6f3da6fb (diff) | |
download | prosody-7468a4e6be2e73122272dc88b63b931ac0fa5c0b.tar.gz prosody-7468a4e6be2e73122272dc88b63b931ac0fa5c0b.zip |
Merge 0.9->trunk
Diffstat (limited to 'doc/names.txt')
0 files changed, 0 insertions, 0 deletions