Merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2018-06-09 14:03:16
Author local date 2018-06-09 16:03:16 +0200
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2018-06-09 14:03:16
Committer local date 2018-06-09 16:03:16 +0200
Commit 035401de6b5b152e1296130ac59a2fd00899f43b
Tree 8b3f12b7606c89b705dd64adad085723b398ab8a
Parent fe659256645bf6758112a797239576aa691d23db
Parent 4d63314db0eac333bf04c3ff6cea3899f4c2cd84
Merged.
ViewGit