chiark / gitweb /
update from for-upstream (merge -s theirs)
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2012 00:35:57 +0000 (01:35 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2012 00:35:57 +0000 (01:35 +0100)
commitf647cfb2ba853eb2a54d29c9f60122e1ccac04ba
treef67f47d59b872b4a645e13abb30a1062b014ab83
parentf0b57ec5b37301dab61595360debab9897a27078
parent050a31d9f4979748f005c1a38eeb9a204881c483
update from for-upstream (merge -s theirs)