Merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2018-11-09 09:49:14
Author local date 2018-11-09 10:49:14 +0100
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2018-11-09 09:49:14
Committer local date 2018-11-09 10:49:14 +0100
Commit a7d88eb4bfc072ce06ddbb6d9f2d7ae1ffd8ef5e
Tree 2ec2144c1534860a3aa8500e9fa9a4342a57e620
Parent 53238f2ecc0b7a675a004580a26ed3a7d28b8b06
Parent 150bcd6563c80698c7f7f5d55332cee105731292
Merged.
ViewGit