Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 18 Jul 2016 15:36:58 +0000 (16:36 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 18 Jul 2016 15:36:58 +0000 (16:36 +0100)
commitd1671a58c39dc5cd36e742fe7c2cff5aa7ac8fe7
tree4cfc7baa1e53c48c59e126fa71c67b279e63a634
parentf38aa05c9798d0dd2ddc70833001c55a3fd5b612
parent4d5c8b2a59f1849d73d8c5784af6ae07fb5c6110
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop