Merge branch 'master' into develop
authorjenkins <jenkins-int@bgbm.org>
Thu, 2 Jun 2016 10:03:23 +0000 (12:03 +0200)
committerjenkins <jenkins-int@bgbm.org>
Thu, 2 Jun 2016 10:03:23 +0000 (12:03 +0200)
commitfd622bdd4ba44e29d3b093e3e68491514536ae3e
tree85730cf6ca3df3d77089a8dedbc7dbcb4adf5ba9
parent7e09f648b8b19c404203d451253164279555cd0e
parent76a193e9d07566dce9ec06e06ecbe016de40b269
Merge branch 'master' into develop