merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2015-02-21 04:57:00
Author local date 2015-02-21 05:57:00 +0100
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2015-02-21 04:57:00
Committer local date 2015-02-21 05:57:00 +0100
Commit 0e697e039790052230028c7ee4e04203fb260e98
Tree f3dae78a6df87fc7de126ad15117ea3d2c2fa522
Parent fddd37ed99ed7808825455dfc9e74cb0d36eae6b
Parent 136e6a02f824da143ca0a6b2491a97d7a545b0f4
merged.
ViewGit