merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2015-02-21 04:53:09
Author local date 2015-02-21 05:53:09 +0100
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2015-02-21 04:53:09
Committer local date 2015-02-21 05:53:09 +0100
Commit 136e6a02f824da143ca0a6b2491a97d7a545b0f4
Tree e5661cd9d6d8dcdde0284db603b27cf29909cf55
Parent ed4dec3420be835b1a52128bc38fc7c0b498e714
Parent abf398eba339373b2ee361e256d576660eeb7423
merged.
ViewGit