merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2014-04-03 04:52:31
Author local date 2014-04-03 06:52:31 +0200
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2014-04-03 04:52:31
Committer local date 2014-04-03 06:52:31 +0200
Commit ea89aaadf7caaa5a8083c6e0a009edf1636fc2d6
Tree 1048a1c790a83c9eee51cb4e235215d89eaeae0e
Parent 6728c019209727550959fab46ebd2aa6076458d0
Parent e14db38ddd6e38610ef3200dbf686ed1e103d04c
merged.
ViewGit