Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 29 Apr 2016 14:57:58 +0000 (15:57 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 29 Apr 2016 14:57:58 +0000 (15:57 +0100)
commitd645ed1944459b6271dea2a8511a1e0f4f997530
tree4561c289829c96014e677905418c6a7d70329e5b
parentef4f0e5535327612b45941f0c5d1d3b4d26fba98
parentb3ed4d44859a84c9490173c3d99b8924889540d6
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop