merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2017-01-24 22:45:03
Author local date 2017-01-24 23:45:03 +0100
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2017-01-24 22:45:03
Committer local date 2017-01-24 23:45:03 +0100
Commit fdaa0528e08a73bf80217af3cbf6531f7b2fb775
Tree 391cbd2256b5589674e4680064c247a7d5c135cf
Parent 4674737c533d58a7f9f6cbff2426ec61725f21ac
Parent 1a491a55513f9867ebfd0677898377f6bb8daf38
merged.
ViewGit