christos e877fc1615 resolve conflict		2017-02-09 02:20:33 +00:00
..
bin	…
dist	resolve conflict	2017-02-09 02:20:33 +00:00
include	…
lib	…
man	…
Makefile	…
TODO	…
openldap.mk	…
openldap2netbsd	merge conflicts	2017-02-09 01:53:50 +00:00