Merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2018-03-31 21:36:46
Author local date 2018-03-31 23:36:46 +0200
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2018-03-31 21:36:46
Committer local date 2018-03-31 23:36:46 +0200
Commit 55f483324011f36b8bfb46ecacc7bd865af27639
Tree 48fed37496e3f225f66568188f107f796e6964e3
Parent d9348417dbd62ee4f0fdb74a4deebd9dcc8ec12f
Parent bab24afee22dbc138636415fe3b540de25fe0eed
Merged.
ViewGit