Merge branch 'master' of ssh://dev.e-taxonomy.eu/var/git/cdmlib
authorAndreas Müller <a.mueller@bgbm.org>
Wed, 17 Jun 2015 17:31:40 +0000 (19:31 +0200)
committerAndreas Müller <a.mueller@bgbm.org>
Wed, 17 Jun 2015 17:31:40 +0000 (19:31 +0200)

Trivial merge