tree ef45a9523d865a4fede9776b355d098e4e868848
parent 4e91af44f3fc8bb919e9604f24ef0f90a32dfbb1
parent 72ce9e73009ccd53d4f96635974e956787f92790
author Patrick Bänziger <patrick.baenziger@bsi-software.com> 1464705894 +0200
committer Patrick Bänziger <patrick.baenziger@bsi-software.com> 1464705894 +0200

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