merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 22 Sep 2014 08:03:54 +0000 (08:03 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 22 Sep 2014 08:03:54 +0000 (08:03 +0000)
commitd394a7ecf6f49f67f05d7a959f1457772d771025
treed38754ad4cae07b8d1e021af28d7d0d5c3436eff
parentfc10df6c2fb0a7412bb36ce61e4e10f21a513c88
parent3429c5db6660f3c9c6ad38700f984c9b5b0fe1df
merge-update from trunk
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java