merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2015-07-06 20:49:35
Author local date 2015-07-06 22:49:35 +0200
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2015-07-06 20:49:35
Committer local date 2015-07-06 22:49:35 +0200
Commit b01db9beec97f8bad517b32e6213db1e0949caf1
Tree f40371dc29f118d50ad39f9d8dc91b52ec79e66e
Parent 8b32ed575916220aac9b79832def975ecd1d22c0
Parent 0e093078b9b556c88dd653a297a8421efe295c7c
merged.
ViewGit