merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2015-07-16 20:15:31
Author local date 2015-07-16 22:15:31 +0200
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2015-07-16 20:15:31
Committer local date 2015-07-16 22:15:31 +0200
Commit 6d70a5dec940a10fdebe16e714cfbf43b94b4f60
Tree af32e48e38d0e5d955fe11220e303988e1c65e69
Parent c3a330b3a66a76159d25861cc639f19288da1c95
Parent 0fb1eb6cf7a031f1126ae48d609fb87a77c6eb84
merged.
ViewGit