merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2015-06-23 01:29:22
Author local date 2015-06-23 03:29:22 +0200
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2015-06-23 01:29:22
Committer local date 2015-06-23 03:29:22 +0200
Commit 267584ac7740b5001580a4e8f8bd8cef0e062669
Tree 19c565516e980b62111ab8a76d1cbb20b97f5af7
Parent 32f159a8fdc280a68d6176bf834414c1c986f316
Parent 27b906c7ea222e14bb8f2565a0d81b2e5fbbd677
merged.
ViewGit