Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
authorKatja Luther <k.luther@bgbm.org>
Tue, 13 Oct 2015 10:48:18 +0000 (12:48 +0200)
committerKatja Luther <k.luther@bgbm.org>
Tue, 13 Oct 2015 10:48:18 +0000 (12:48 +0200)
commit515c1f40b0b00493c899c399f0f2e82485dd966d
treefcde07213c9e5319a0c4a4076059d32f33d329bc
parentfd602c14937bb3ae2aee9ddb9cfeab97a2900101
parentce82a12ec3668ee7929ab58b653c9065755cadc3
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop