Merge branch 'patch/JAL-848' into JAL-429_phylip-file-support
authorJim Procter <j.procter@dundee.ac.uk>
Mon, 6 Oct 2014 16:27:56 +0000 (17:27 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Mon, 6 Oct 2014 16:27:56 +0000 (17:27 +0100)

Trivial merge