Merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2018-03-31 21:35:23
Author local date 2018-03-31 23:35:23 +0200
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2018-03-31 21:35:23
Committer local date 2018-03-31 23:35:23 +0200
Commit d9348417dbd62ee4f0fdb74a4deebd9dcc8ec12f
Tree c3dc9374fccac8acd937c009b836f05fcd672177
Parent 43d47ef33674f799131a9aefb0435a54f07b0786
Merged.
ViewGit