Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 6 Nov 2015 09:03:32 +0000 (09:03 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 6 Nov 2015 09:03:32 +0000 (09:03 +0000)

Trivial merge