merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2018-07-13 14:49:57
Author local date 2018-07-13 16:49:57 +0200
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2018-07-13 14:49:57
Committer local date 2018-07-13 16:49:57 +0200
Commit f254336a92497fec0900b8088c55f71c113f4ab4
Tree 984d3c5622bb959a9be435232c5fe771e367393a
Parent 89a55f96ac682df63353ae3da53fdbc3b1dc15b0
Parent 8a906e7b4f6134512dc4b9d4100c69c8cb49d963
merged.
ViewGit