Merge branch 'master' into develop
authorjenkins <jenkins-int@bgbm.org>
Thu, 16 Jul 2015 09:11:32 +0000 (11:11 +0200)
committerjenkins <jenkins-int@bgbm.org>
Thu, 16 Jul 2015 09:11:32 +0000 (11:11 +0200)
commitb4bf78facca8c9d1f075c882d53487c3cd7bba41
tree17e244c7188ea465173860a8940345483ac9553a
parent5594e56eedc32cb1265df89f0d63044926547191
parentc37ed47c217b15d289cde4feeb937ae46c04014f
Merge branch 'master' into develop