chiark / gitweb /
Merge branch 'master' into stable-6.x
authorIan Jackson <ian@liberator.relativity.greenend.org.uk>
Sun, 12 Sep 2010 18:52:34 +0000 (19:52 +0100)
committerIan Jackson <ian@liberator.relativity.greenend.org.uk>
Sun, 12 Sep 2010 18:52:34 +0000 (19:52 +0100)
commitc57d4c361a88f00f0d6dfc3bcb20f87f1d957527
tree08726b2006badf3607a706ec845572f5e32bee4b
parent024f4a767b43a66e6ff004532f039b874e401b80
parent3e4a7984047224b0ffc532bbfaec359b37a7bc63
Merge branch 'master' into stable-6.x