merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2014-03-30 17:52:45
Author local date 2014-03-30 19:52:45 +0200
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2014-03-30 17:52:45
Committer local date 2014-03-30 19:52:45 +0200
Commit 087d084cdd1ab84fdfb75343d7392507112a2efb
Tree 1b46c6ca1322c885ab9c30ee8e0aba9c1d91d782
Parent 160647108f9b21a4d46d17a18eb2e5084ccf29a7
Parent fe28544915ba3439c71a9431b4b1b59b09223132
merged.
ViewGit