diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-06-13 13:56:58 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-06-13 13:56:58 +0100 |
commit | a3e3c7ecc7bccff307dd31a34c2400266782ef31 (patch) | |
tree | 840496b3acda4627207ef0f3878e30faec07986a /doc/names.txt | |
parent | f5b07ef8c17c9042c532b5450cbc1301cd31e872 (diff) | |
parent | 7507b21e6afb3d79c1f79e03d7ed168cc4cbaa39 (diff) | |
download | prosody-a3e3c7ecc7bccff307dd31a34c2400266782ef31.tar.gz prosody-a3e3c7ecc7bccff307dd31a34c2400266782ef31.zip |
Merge 0.9->trunk
Diffstat (limited to 'doc/names.txt')
0 files changed, 0 insertions, 0 deletions