tree a58f33f6629fe3bdb61559ea16e1910b8649807b
parent ee2bac4ce86c70a31b93b1b6cfc8f035d09904f1
parent 473155a9763295f09e7f2e8f05ebe68d22f71e48
author Patrick Bänziger <patrick.baenziger@bsi-software.com> 1461932216 +0200
committer Patrick Bänziger <patrick.baenziger@bsi-software.com> 1461932216 +0200

Merge remote-tracking branch 'origin/releases/5.2.x' into releases/6.0.x