chiark / gitweb /
update from for-upstream (merge -s theirs)
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 10 Aug 2012 17:10:35 +0000 (18:10 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 10 Aug 2012 17:10:35 +0000 (18:10 +0100)
commit467b2d187ddcd1f350d066ce3a79d824b593cdaa
tree742b5660b5324fd909a5fb552158d585c216b3c1
parent757bfaf3de7400d33a3d13072ac1bfa016747050
parentc2c2e0a6e303900d56798ee6186ea114f97c4ed2
update from for-upstream (merge -s theirs)