merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Thu, 9 Oct 2014 11:21:55 +0000 (11:21 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Thu, 9 Oct 2014 11:21:55 +0000 (11:21 +0000)
commit940ec0fadda361c33f790f50906ba162a3db1190
treecf863b97374f1fd1a3eed1d6e1f134e7821195ef
parentdc53482f5393decdfa0f2c2559d6bf3a06159be3
parent0cb5062f308423daf099fb806bb2d07c3edc5851
merge-update from trunk
.gitattributes
eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationUtil.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java