Merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2018-11-21 13:56:31
Author local date 2018-11-21 14:56:31 +0100
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2018-11-21 13:56:31
Committer local date 2018-11-21 14:56:31 +0100
Commit 1ce8de68262c0a8e2bf3804b1c859de4a017ddfb
Tree 54bf4d529aa2a681332ba250d23ea833af65ccf3
Parent 165cc7cd2ca89df3e3aa7c0ec304aeba64baf7c2
Parent 9e4fa739e2b6b49cafdb3e14a4b5b01f70c70c0f
Merged.
ViewGit