diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-04-05 10:04:53 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-04-05 10:04:53 +0100 |
commit | c84e9926d2d60a8587c1e57daa37baad489585b5 (patch) | |
tree | 60c4be5a40bd2c13dcfb8435083d1b23619523a4 /COPYING | |
parent | 35c29e6177000d7adc28fbc35e48293fc958a63b (diff) | |
parent | 123fef628e6b8ba0da52a05d9186cddcc265ccec (diff) | |
download | prosody-c84e9926d2d60a8587c1e57daa37baad489585b5.tar.gz prosody-c84e9926d2d60a8587c1e57daa37baad489585b5.zip |
Merge with Maranda
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions