Merge branch 'jims_crlf_hell_JAL-1551' of https://source.jalview.org/git/jalview...
authorJim Procter <j.procter@dundee.ac.uk>
Wed, 15 Oct 2014 14:48:27 +0000 (15:48 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Wed, 15 Oct 2014 14:48:27 +0000 (15:48 +0100)

Trivial merge