Merge branch 'master' into develop
authorjenkins <jenkins-int@bgbm.org>
Wed, 16 Sep 2015 17:43:56 +0000 (19:43 +0200)
committerjenkins <jenkins-int@bgbm.org>
Wed, 16 Sep 2015 17:43:56 +0000 (19:43 +0200)

Trivial merge