tree ff67e766c37a2f07d612f7079043d95ed58b7e95
parent 65fdde0e494a5764efee4a6ed10e8b6b81bf15dd
parent df6e79a5f03ffcd4bb512c48410e848ba61bfcf7
author Michael Rudolf <mru@bsi-software.com> 1588656580 +0200
committer Michael Rudolf <mru@bsi-software.com> 1588658123 +0200

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