Merge branch 'develop' into trial_merge/JAL-1950
[jalview.git] / .gitattributes
2014-10-14 gmungocJAL-1551 CRLF handling
2014-10-10 gmungocJAL-1551 CRLF handling