Merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2017-05-01 20:15:16
Author local date 2017-05-01 22:15:16 +0200
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2017-05-01 20:15:16
Committer local date 2017-05-01 22:15:16 +0200
Commit dfad4ae577346733277ce4884dcc7eb44e35918b
Tree 30d85828a15993988c0924d9d7a605a12db6cf6a
Parent 01026ba2c68331e86f6365765d926b386ca99bff
Parent 32115a4d79abd3da481de0b2ad32e52d08b7f486
Merged.
ViewGit