aboutsummaryrefslogtreecommitdiffstats
path: root/COPYING
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-07-15 08:27:56 +0100
committerMatthew Wild <mwild1@gmail.com>2010-07-15 08:27:56 +0100
commit948f1a6aedb694d02771180c963c2105ecee0fb2 (patch)
tree17168675d0663999c2f0e1e0fb07fc09bfd9b4ef /COPYING
parentb3416f9848cb623ba1fd2b998ce438dc930850cd (diff)
parent1ec1d76bf9dd5cc4f738fccb1f83e29e970eed56 (diff)
downloadprosody-948f1a6aedb694d02771180c963c2105ecee0fb2.tar.gz
prosody-948f1a6aedb694d02771180c963c2105ecee0fb2.zip
Merge with backout
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions