Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 14 Nov 2014 15:33:20 +0000 (15:33 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 14 Nov 2014 15:33:20 +0000 (15:33 +0000)

Trivial merge