merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2018-07-25 21:54:47
Author local date 2018-07-25 23:54:47 +0200
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2018-07-25 21:54:47
Committer local date 2018-07-25 23:54:47 +0200
Commit fb66465672b896d8ce0e24128a76267c6ddd34e7
Tree 533168a8f7af6901c346ce6e43bee58291f7f4ad
Parent 3a1edbb835029a896a4ad9196e604f0d80c3f861
Parent f254336a92497fec0900b8088c55f71c113f4ab4
merged.
ViewGit