merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2014-04-12 23:39:47
Author local date 2014-04-13 01:39:47 +0200
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2014-04-12 23:39:47
Committer local date 2014-04-13 01:39:47 +0200
Commit 6afb265255313bba05603887121077d1785caa47
Tree 347b1e7be743ea528d71d7482e4b99b99bc85f81
Parent 3615de8d685b2db3b847d535b7b47cc8cb3380fe
Parent 7beac29a880f89a7791f34a8395f4ad490575a54
merged.
ViewGit