chiark / gitweb /
update from for-upstream (merge -s theirs)
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 8 Aug 2012 17:56:55 +0000 (18:56 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 8 Aug 2012 17:56:55 +0000 (18:56 +0100)
commit68c11ddd7a726622a06a0828c52fc53a6ca9956f
treed4c7ea1a64c2179833d726dac6e9a76d170ff23b
parente6cfeb6e2d0b1f540491947ffff8a721ad0e9274
parent48f1b27f67cb5a1b59e72d4ab9c5bfe05c88870d
update from for-upstream (merge -s theirs)