merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2018-10-27 21:35:08
Author local date 2018-10-27 23:35:08 +0200
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2018-10-27 21:35:08
Committer local date 2018-10-27 23:35:08 +0200
Commit 6901cd269419d4dd273753cf111ed620126dfbdf
Tree da35fd7fb5b373a03738924cebffbc25445366ef
Parent af2d01fedc46959c3754099acace026ee5bd684b
Parent 2e65e36455db39340468fca40643daa33a9c9eec
merged.
ViewGit