Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
authorKatja Luther <k.luther@bgbm.org>
Thu, 15 Oct 2015 09:26:51 +0000 (11:26 +0200)
committerKatja Luther <k.luther@bgbm.org>
Thu, 15 Oct 2015 09:26:51 +0000 (11:26 +0200)
commit3605c71600796fe42d67b5a36c3aa894d3ad55fc
tree267034465a05d0d4e36252abd03955334fbf8127
parent5bd41add3a2019bfd41ed1e23f8e4de30648b64e
parentbc073c98fd4e9ae473e3f891307b4566267ba91f
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop