my changelog was in conflict, resolving this
[matthijs/upstream/backupninja-vserver.git] / COPYING
2005-10-26 micahOops, cleanup and move the license to the standard...