tree cedcb6f535468b9acfcb39d416d5de6c4e4deacf
parent bde6813013cc6f0bd58ef56e8d1f295f0863384c
parent fa68c99945e27f2e30b7a65adc81a3831a350cc1
author Bertrand Gouny <bertrand.gouny@osixia.net> 1562531403 +0200
committer Bertrand Gouny <bertrand.gouny@osixia.net> 1562531403 +0200

Merge branch 'eduardosan-stable' into hotfix-1.2.5