Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 10 Aug 2015 13:12:10 +0000 (14:12 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 10 Aug 2015 13:12:10 +0000 (14:12 +0100)
commitb3e7a31595ec48c21e203f414fcd7fe7d3f0c329
treeacad1fba0e989f30f8ae75ef03f4459bf458d782
parent92cd73ae8a6ce923835f02919a9b4b59265d51cc
parent22a19bd5a73225168170d2b48c91518c0a3fa294
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop