merge branches
authorU-BGBM\k.luther <k.luther@BGBM11732.bgbm.fu-berlin.de>
Tue, 6 Oct 2015 09:09:44 +0000 (11:09 +0200)
committerU-BGBM\k.luther <k.luther@BGBM11732.bgbm.fu-berlin.de>
Tue, 6 Oct 2015 09:09:44 +0000 (11:09 +0200)
commitd17ecaf77fbdd1f9090c7852bcde9a0ae709571e
treee5f95435cd5f452c0868eda61df0c3965aacc1bc
parentbba3fcf8ed310a5f1012221d70a0a065c698f409
parentc860d200ef52f74bac80408bdaee665a55d25ad9
merge branches
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java