Merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2018-08-02 20:12:13
Author local date 2018-08-02 22:12:13 +0200
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2018-08-02 20:12:13
Committer local date 2018-08-02 22:12:13 +0200
Commit 9e66ba8245a565b159d8d66c272232c8fb7d112e
Tree 234a406679720258dbf25998c6ab7e7f6b086208
Parent 16bca887456e0c7e0a5d9d5e380b5be2c8aaa183
Parent aef849ad4f474475cd58394cb8e152359965abf5
Merged.
ViewGit