merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2014-06-04 23:45:56
Author local date 2014-06-05 01:45:56 +0200
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2014-06-04 23:45:56
Committer local date 2014-06-05 01:45:56 +0200
Commit acc882aed3b00c658509637037659fb7136d549f
Tree 8e40786e48349e5aee7b0e30cf20af35656e242b
Parent 2db2e578be2913cf90bd68622a10d4a0f9dd4749
Parent 85a53d1d4d0694aefd8239bf9566b35970a52bab
merged.
ViewGit