aboutsummaryrefslogtreecommitdiffstats
path: root/COPYING
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2008-11-29 20:30:35 +0100
committerTobias Markmann <tm@ayena.de>2008-11-29 20:30:35 +0100
commitf39b9177c92385836bf216a459b159784a98ce23 (patch)
treeb101dd1edbe21beaaf7604b05ba6f49059ad2b04 /COPYING
parent8d6ef1df3855daca2cb0cab27ce443816dba2d2b (diff)
parente20fe5e4675cb489a24664b8d465e6c445077ed9 (diff)
downloadprosody-f39b9177c92385836bf216a459b159784a98ce23.tar.gz
prosody-f39b9177c92385836bf216a459b159784a98ce23.zip
Automated merge.
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions