chiark / gitweb /
update from for-upstream (merge -s theirs)
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 9 Aug 2012 18:20:24 +0000 (19:20 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 9 Aug 2012 18:20:24 +0000 (19:20 +0100)
commita4db26bc3506542a0cb2d7e7a40cc66530467f13
tree65e89c3d4bc0793f6319f43ce50abe85a5c9509c
parent68c11ddd7a726622a06a0828c52fc53a6ca9956f
parent9d990cf5e09c2e8657adb772ce83707ec1cf75d8
update from for-upstream (merge -s theirs)