Merge branch 'hotfix/3.12.2' into develop
authorjenkins <jenkins-int@bgbm.org>
Tue, 12 Jan 2016 09:10:16 +0000 (10:10 +0100)
committerjenkins <jenkins-int@bgbm.org>
Tue, 12 Jan 2016 09:10:16 +0000 (10:10 +0100)
commitd9e8e24916cbf078aca33e4f74441e94b0b67c55
tree667c3040242933da5bd4f2b4bf40e39b240f5cd9
parenta3e7482e947b068324cf9ea470e084344f6cdc4d
parent0f343e3a52fc38dc2ba612c8e758fbfbc73c159b
Merge branch 'hotfix/3.12.2' into develop