Add FreeBSD merge strategy
Merge branch 'master' of github.com:dspinellis/unix-history-make

Conflicts:
	notes.txt
Merge branch 'master' of github.com:dspinellis/unix-history-make