merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Wed, 17 Sep 2014 12:39:35 +0000 (12:39 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Wed, 17 Sep 2014 12:39:35 +0000 (12:39 +0000)
commit1c869e725349302736a0d17ea3175475260dc7e3
tree8dc93b822cdc40dec3b9572f8b1f891d4829af3f
parent305901411bf655d0aa8e44aceae2396b526d5552
parentc43d0839e36af634e39953199310c44bb50fe313
merge-update from trunk
.gitattributes
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
pom.xml