Merge branch 'merge/JAL-4054+JAL-4064' into ben-big-merge
[jalview.git] / .gitattributes
2014-10-14 gmungocJAL-1551 CRLF handling
2014-10-10 gmungocJAL-1551 CRLF handling