Merge branch 'develop' into feature/cdm-4.7
authorAndreas Müller <a.mueller@bgbm.org>
Sun, 4 Jun 2017 21:46:03 +0000 (23:46 +0200)
committerAndreas Müller <a.mueller@bgbm.org>
Sun, 4 Jun 2017 21:46:03 +0000 (23:46 +0200)
commite0a3a1c2922adc99fa1f53551698fdb48a5cd974
treef46074e21ba16a59827f3665e6e9afe7449a905c
parent92344bf3b22c7ba3946c65c3c13a775406d0ce9a
parent0af1961162e26e2829e63f151be91d61b903bfbe
Merge branch 'develop' into feature/cdm-4.7