merge with local branch
authorU-BGBM\k.luther <k.luther@BGBM11732.bgbm.fu-berlin.de>
Wed, 23 Sep 2015 12:29:31 +0000 (14:29 +0200)
committerU-BGBM\k.luther <k.luther@BGBM11732.bgbm.fu-berlin.de>
Wed, 23 Sep 2015 12:29:31 +0000 (14:29 +0200)
commit8de05ed8187d801967847fd9734cff62accbe256
tree3d3452dd95e2fdd44dbf909a4d5466e46db38876
parent5354f6936314cfe1f547abf11ab0a259d7f4134b
parent9e671498ac1f520d78aabfa91f9ea8966b3f4b83
merge with local branch
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/DeleteHandler.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/ChangeAcceptedTaxonToSynonymOperation.java