tree 222bbbd9948ae499fafaedac971e8742fcb514e2
parent 8424403fb352c1474b38b94173cb0183e1dbd7cb
parent ce62c92de3a34f1e8bfe7d4137fc30a377ced5be
author Patrick Bänziger <patrick.baenziger@bsi-software.com> 1522060657 +0200
committer Patrick Bänziger <patrick.baenziger@bsi-software.com> 1522060657 +0200

Merge remote-tracking branch 'origin/releases/7.0.x' into releases/7.1.x

Change-Id: I910833d626c3d84c19c18396b7802e5956ac4f21