Merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2018-05-11 09:45:47
Author local date 2018-05-11 11:45:47 +0200
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2018-05-11 09:45:47
Committer local date 2018-05-11 11:45:47 +0200
Commit 5b9858005ccc653040c3d18f570f7c18970fd837
Tree 5912da967660b689e8c3530160b296687d447980
Parent 1f8e5c1cb1d01fdb79fdca52979d293df547abfc
Parent c1c04e4f56cbb60497cd1a5f88f9ea32a35c03a4
Merged.
ViewGit