Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 27 Aug 2015 11:34:07 +0000 (12:34 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 27 Aug 2015 11:34:07 +0000 (12:34 +0100)
commit35239f8b43e99eed4c6d81f018b86704ca1e81b7
tree6d42595dae061237469c2689dba8de5307d78d89
parent023d23abaad346f745b93fced2407d7342ab7171
parent765ad5ac047c31cc185e39d24eb14debf1958958
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop