merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2018-10-27 21:34:42
Author local date 2018-10-27 23:34:42 +0200
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2018-10-27 21:34:42
Committer local date 2018-10-27 23:34:42 +0200
Commit 2e65e36455db39340468fca40643daa33a9c9eec
Tree 4d50a619a7bcf7a4fc559bef6d60bfd0a3f2b235
Parent 564d43da0beeccb3dd5beef4c266af1ece18a710
Parent 51d3a077b9ad0135506fbed132b00210d187cb5c
merged.
ViewGit