Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 29 Sep 2016 11:49:56 +0000 (12:49 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 29 Sep 2016 11:49:56 +0000 (12:49 +0100)
commit78c650c30d56b625a110e2cf5fdec93b9ff55e88
tree7a76eb1b00594e1afa02d52ca4c120d67bb46848
parent0d099414b4c6d0014630589ea4218de07ccf3db9
parent3446323f14bb8a2842cb83f74ed3f41c99b62759
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop