-
Tomek Mrugalski authored
Conflicts: ChangeLog configure.ac src/bin/cmdctl/Makefile.am src/bin/cmdctl/botan-certgen.cc src/bin/cmdctl/tests/Makefile.am src/bin/cmdctl/tests/botan-certgen_test.py src/bin/d2/tests/Makefile.am src/bin/d2/tests/d2_test.py src/bin/dhcp4/tests/Makefile.am src/bin/dhcp6/tests/Makefile.am src/bin/tests/process_rename_test.py.in
d7b297ac