Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/cdmlib into develop
authorAndreas Müller <a.mueller@bgbm.org>
Thu, 10 Nov 2016 15:30:57 +0000 (16:30 +0100)
committerAndreas Müller <a.mueller@bgbm.org>
Thu, 10 Nov 2016 15:30:57 +0000 (16:30 +0100)

Trivial merge