Merge branch 'Release_2_9_Branch' of https://source.jalview.org/git/jalview.git into...
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 28 Apr 2015 15:55:30 +0000 (16:55 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 28 Apr 2015 15:55:30 +0000 (16:55 +0100)

Trivial merge