Merge branch 'release/4.12.0' into develop
authorjenkins <jenkins-int@bgbm.org>
Wed, 6 Dec 2017 12:29:06 +0000 (13:29 +0100)
committerjenkins <jenkins-int@bgbm.org>
Wed, 6 Dec 2017 12:29:06 +0000 (13:29 +0100)
commit3f8ffdbb83f87c5af4e3ba04d2368829e1505fb2
treed6e6e65be7605710525e641f8fedae95762ff7e6
parent9a2d41178db5e857cdbe406679fdec9a5443e73a
parente42c54945771bc273aafa1ca8f8bddf01d4d387e
Merge branch 'release/4.12.0' into develop