chiark / gitweb /
Merge branch 'stable'
authorIan Jackson <ian@liberator.relativity.greenend.org.uk>
Fri, 24 Jul 2009 16:54:14 +0000 (17:54 +0100)
committerIan Jackson <ian@liberator.relativity.greenend.org.uk>
Fri, 24 Jul 2009 16:54:14 +0000 (17:54 +0100)

Trivial merge