chiark / gitweb /
merge fixes/clarifications - change , to \land