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)
1  2 
.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

diff --cc .gitattributes
Simple merge