aboutsummaryrefslogtreecommitdiffstats
path: root/doc/names.txt
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-04-05 10:04:53 +0100
committerMatthew Wild <mwild1@gmail.com>2013-04-05 10:04:53 +0100
commitc84e9926d2d60a8587c1e57daa37baad489585b5 (patch)
tree60c4be5a40bd2c13dcfb8435083d1b23619523a4 /doc/names.txt
parent35c29e6177000d7adc28fbc35e48293fc958a63b (diff)
parent123fef628e6b8ba0da52a05d9186cddcc265ccec (diff)
downloadprosody-c84e9926d2d60a8587c1e57daa37baad489585b5.tar.gz
prosody-c84e9926d2d60a8587c1e57daa37baad489585b5.zip
Merge with Maranda
Diffstat (limited to 'doc/names.txt')
0 files changed, 0 insertions, 0 deletions