chiark / gitweb /
update from for-upstream (merge -s theirs)
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 10 Aug 2012 18:36:40 +0000 (19:36 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 10 Aug 2012 18:36:40 +0000 (19:36 +0100)
commitf0b57ec5b37301dab61595360debab9897a27078
tree742b5660b5324fd909a5fb552158d585c216b3c1
parent467b2d187ddcd1f350d066ce3a79d824b593cdaa
parent5e01a34f57ba24e6685e40688b2649150e25be43
update from for-upstream (merge -s theirs)