Merge branch 'master' into develop
authorjenkins <jenkins-int@bgbm.org>
Tue, 3 May 2016 11:57:01 +0000 (13:57 +0200)
committerjenkins <jenkins-int@bgbm.org>
Tue, 3 May 2016 11:57:01 +0000 (13:57 +0200)
commit67363206d21d55b1b61a5f945ef08b3200df6a2e
treeeffc5f71af593e4e82391a26cd825a6afd74a86c
parentfbcabd08c1306ebed5ed67d7b2ea4db5f7fd1e8a
parent9d197128ffbdc7a0f76c56e2d5cb5d43b746eb61
Merge branch 'master' into develop