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

Trivial merge