merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 30 Jun 2015 13:04:15 +0000 (13:04 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 30 Jun 2015 13:04:15 +0000 (13:04 +0000)
commit9efdbc2934d0759ea00486a71479db67a206d885
tree7e9dcfd69aee10adedc022561e9913d8028f222f
parent3419670f29743617b6f572f9e8485612ea8216f6
parent23a2223ad1188f205d3e09105dc309b633808052
merge-update from trunk
.gitattributes
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/AlignmentEditor.java