chiark / gitweb /
Merge from dmanual branch
authorRichard Kettlewell <rjk@greenend.org.uk>
Tue, 1 Dec 2009 20:12:25 +0000 (20:12 +0000)
committerRichard Kettlewell <rjk@greenend.org.uk>
Tue, 1 Dec 2009 20:12:25 +0000 (20:12 +0000)

Trivial merge