Merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2018-06-15 11:26:05
Author local date 2018-06-15 13:26:05 +0200
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2018-06-15 11:26:05
Committer local date 2018-06-15 13:26:05 +0200
Commit 2e3899b899fb6dcd67512f50c122097a85597014
Tree 13a74dac6a458df529867c60ccffdec16ec93ad0
Parent 90e003dfaac82843b8b2363443ba169f1a2abe91
Parent 56e3616a3b537ffe6ee1514b968155e5dc7dda29
Merged.
ViewGit