Merge branch 'master' into develop
authorjenkins <jenkins-int@bgbm.org>
Thu, 16 Jul 2015 08:45:33 +0000 (10:45 +0200)
committerjenkins <jenkins-int@bgbm.org>
Thu, 16 Jul 2015 08:45:33 +0000 (10:45 +0200)
commit4cee564ddb2963a87bf2c1eba3e19ec2c22c7f12
tree17e244c7188ea465173860a8940345483ac9553a
parenta3edb2ea68bc29e0180836796cba05f59acd80d2
parentf8ca841906af6b6d7fe0b70326968bcf266e2f3a
Merge branch 'master' into develop