chiark / gitweb /
Merge from dmanual branch