Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 10 Aug 2017 11:56:12 +0000 (12:56 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 10 Aug 2017 11:56:12 +0000 (12:56 +0100)
commit78e1accb64429ec0630d237bf2268d733076aa6f
treeff5412a77a072917819a412ede2505a3459cf6dc
parentac556c533791c50fd03029357eedce928991213b
parentc1d8956aee448b4b6bb88d2936d3816f9052e5ec
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop