Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 29 May 2015 13:56:48 +0000 (14:56 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 29 May 2015 13:56:48 +0000 (14:56 +0100)

Trivial merge