Merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2017-01-25 11:00:44
Author local date 2017-01-25 12:00:44 +0100
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2017-01-25 11:00:44
Committer local date 2017-01-25 12:00:44 +0100
Commit fc2eeef4b57523a96c51fbb1a8030e1ab007d208
Tree 04c2476bc1d0b9ca1c5f14eb6bb937d9d2bc18cc
Parent 688bca8fe790df9560a7a82c49fce05c650825c9
Parent 03f155a2d895e8ef43fa7e08177d279b9404dbc3
Merged.
ViewGit