diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-11-09 18:37:13 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-11-09 18:37:13 +0000 |
commit | a15849cf9ac371f9c328702a0129b4f1c63b1f90 (patch) | |
tree | e3dab93899e69c3342f06ebd3ef65bda4c11915d /COPYING | |
parent | 37895d0d715ca071bc1c79554935074bbec3dd1c (diff) | |
parent | 3186d24c03e4d940aabe4619ec0b661fb27ad11d (diff) | |
download | prosody-a15849cf9ac371f9c328702a0129b4f1c63b1f90.tar.gz prosody-a15849cf9ac371f9c328702a0129b4f1c63b1f90.zip |
Merge 0.10->trunk
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions