diff options
author | Matthew Wild <mwild1@gmail.com> | 2011-04-05 14:38:08 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2011-04-05 14:38:08 +0100 |
commit | 55a1e9a4e2a78ad7d6a5a2a15c708dfaf0fcaaa0 (patch) | |
tree | 59ee455eed836439659c9f0fe7840831cbee4100 /COPYING | |
parent | 1cfb734e0ecde10fcd5f457c1394ecb3b7a28e2a (diff) | |
parent | c1e4f6fbdabf5fb3569498877647200daaa6867f (diff) | |
download | prosody-55a1e9a4e2a78ad7d6a5a2a15c708dfaf0fcaaa0.tar.gz prosody-55a1e9a4e2a78ad7d6a5a2a15c708dfaf0fcaaa0.zip |
Merge 0.8 -> trunk
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions