Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
authorKatja Luther <k.luther@bgbm.org>
Wed, 14 Oct 2015 08:19:00 +0000 (10:19 +0200)
committerKatja Luther <k.luther@bgbm.org>
Wed, 14 Oct 2015 08:19:00 +0000 (10:19 +0200)
commit684502281f690b1b3ee161079377c93ed8a744ab
treecf3aa6f3d90d8e6b7d412a2d50edc7142ed08c47
parent7d8cee12bade248aa49026e01abaf89b2c64b27d
parentd875880c421f72daf8dad9645eed3ff976f11a0b
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop