Merge branch 'develop' into features/JAL-1541_BioJsMSAViewer-export-option
authorJim Procter <jprocter@dundee.ac.uk>
Wed, 12 Nov 2014 15:19:19 +0000 (15:19 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Wed, 12 Nov 2014 15:19:19 +0000 (15:19 +0000)

Trivial merge