chiark / gitweb /
merge fixes/clarifications - relax Foreign Merges