Merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2018-03-31 20:01:16
Author local date 2018-03-31 22:01:16 +0200
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2018-03-31 20:01:16
Committer local date 2018-03-31 22:01:16 +0200
Commit bab24afee22dbc138636415fe3b540de25fe0eed
Tree b4bec0e9a5ef7eae50d84208d6dd6a1d39420176
Parent f6aa731f7ac6288dcc19e8ec18a89a7a6b3f810b
Parent 43d47ef33674f799131a9aefb0435a54f07b0786
Merged.
ViewGit