merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2015-07-16 22:32:36
Author local date 2015-07-17 00:32:36 +0200
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2015-07-16 22:32:36
Committer local date 2015-07-17 00:32:36 +0200
Commit 71d7b5b9c2a87d53da2c7d7139323c1b376dac49
Tree 5ee5faba4122fadc2d5ca19968a133aece8b82a6
Parent 1f58b3b1247dc417155ed0b9f93a601d89ebff94
Parent 6d70a5dec940a10fdebe16e714cfbf43b94b4f60
merged.
ViewGit