merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2016-06-13 14:08:18
Author local date 2016-06-13 16:08:18 +0200
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2016-06-13 14:08:18
Committer local date 2016-06-13 16:08:18 +0200
Commit de520ebe670d2a7b9d433c43416fcc49dcdac16e
Tree 922b5730ea23e189cfa0592447f86172a999ca9a
Parent d392b7df6e838787c683c9f5e4e4bae9411feb32
Parent 0b56f586994c7548f74bddd6cb57f293ccf263ed
merged.
ViewGit