Merge remote-tracking branch 'origin/cdm-4.7' into feature/cdm-4.7
authorAndreas Müller <a.mueller@bgbm.org>
Thu, 4 May 2017 06:30:48 +0000 (08:30 +0200)
committerAndreas Müller <a.mueller@bgbm.org>
Thu, 4 May 2017 06:30:48 +0000 (08:30 +0200)
commit9be42500f10d3f38196a2e3de05219f886fe46a4
treee34795d7545de9cead6ef18bad4c82e4b3f3ac51
parentff614835835c8ec245550f26fd356f20a2a71ee7
parent12cc5ef3985602e7675a9c882d3f14d299b84c91
Merge remote-tracking branch 'origin/cdm-4.7' into feature/cdm-4.7