Merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2018-11-21 10:30:02
Author local date 2018-11-21 11:30:02 +0100
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2018-11-21 10:30:02
Committer local date 2018-11-21 11:30:02 +0100
Commit 020f83f4db30253499bdfe7ccbc53dce492b69c7
Tree 51a45305e38faa95f21e7506b3e57efa448d1ed4
Parent e29617f843666f8418344500dad20e497086ca93
Parent 4c1eb14dcf9359a2ff5b15a69622326050fee000
Merged.
ViewGit