Merge branch 'release/4.2.0' into develop
authorjenkins <jenkins-int@bgbm.org>
Wed, 6 Jul 2016 15:06:12 +0000 (17:06 +0200)
committerjenkins <jenkins-int@bgbm.org>
Wed, 6 Jul 2016 15:06:12 +0000 (17:06 +0200)
commit15ee844946c00c4004d4229da9ced7fdc184312f
treeb47a6d8c1920dda038b1630884637b6693a1156b
parent3c928d6e9978ff625cfedbc85fd9eb4d96dd20ab
parent5b574d183bef551bc2995145387dd0256975e2ce
Merge branch 'release/4.2.0' into develop