Merge branch 'master' into socket
[doldaconnect.git] / COPYING
2005-10-14 fredrikTransfer from CVS at SourceForge