Merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2018-12-25 23:33:02
Author local date 2018-12-26 00:33:02 +0100
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2018-12-25 23:33:02
Committer local date 2018-12-26 00:33:02 +0100
Commit 892bd8b1a560f452512cabd51b7ab8c644c2b449
Tree 555495fe91dbf3af4b3e0fb3ccb6a6f1608d12f7
Parent 0cf75bdfd617e7bda1860b62d16b108528099afe
Parent 10db6f161a49004c814fe8c6ccfb8f196a0d5d79
Merged.
ViewGit