diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-07-15 08:27:56 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-07-15 08:27:56 +0100 |
commit | 948f1a6aedb694d02771180c963c2105ecee0fb2 (patch) | |
tree | 17168675d0663999c2f0e1e0fb07fc09bfd9b4ef /COPYING | |
parent | b3416f9848cb623ba1fd2b998ce438dc930850cd (diff) | |
parent | 1ec1d76bf9dd5cc4f738fccb1f83e29e970eed56 (diff) | |
download | prosody-948f1a6aedb694d02771180c963c2105ecee0fb2.tar.gz prosody-948f1a6aedb694d02771180c963c2105ecee0fb2.zip |
Merge with backout
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions