chiark / gitweb /
update from for-upstream (merge -s theirs)
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 9 Aug 2012 19:01:42 +0000 (20:01 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 9 Aug 2012 19:01:42 +0000 (20:01 +0100)
commit3539570020ab3c939bd65825049789e95f6f912a
tree2a3d2a3be2b45419cfad09f37d1236ef022acbd3
parenta4db26bc3506542a0cb2d7e7a40cc66530467f13
parent18d670fdea53726fb2223927fcbb49df7037aa7e
update from for-upstream (merge -s theirs)