chiark / gitweb /
Merge branch 'master' into stable-5.x 5.0
authorIan Jackson <ian@liberator.relativity.greenend.org.uk>
Sun, 25 Oct 2009 12:24:52 +0000 (12:24 +0000)
committerIan Jackson <ian@liberator.relativity.greenend.org.uk>
Sun, 25 Oct 2009 12:24:52 +0000 (12:24 +0000)
commit6302552bfa5844eddb7c26386c9995733f0a5174
tree6207f3876a5cf8ce2a814a218b39b303749beda8
parentdc62905fe72a3547ce8164744e9428a58b1a6a29
parentc444da554d8b434492399eaf81574c081dad7141
Merge branch 'master' into stable-5.x