Merge branch 'release/3.7.0' attic/tags/cdmlib/3.7.0/24929
authorjenkins <jenkins-int@bgbm.org>
Wed, 15 Jul 2015 16:10:45 +0000 (18:10 +0200)
committerjenkins <jenkins-int@bgbm.org>
Wed, 15 Jul 2015 16:10:45 +0000 (18:10 +0200)

Trivial merge