chiark / gitweb /
Merge from existing archive branch master
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 13 Jul 2016 21:28:36 +0000 (22:28 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 13 Jul 2016 21:28:36 +0000 (22:28 +0100)
commit2eff192ffb05d971cee1b7ec3c611d7ac65ccb91
tree244ea2722e1c9e399c4de9750db7dbb00c2cc462
parent6692e4cb2ef5bf68b3fbf10aaaec7a3e8cfa6f74
parente747a910bf5e16b8da233b0b4acd4390878897c4
Merge from existing archive branch

-s ours.