Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 13 Nov 2014 16:15:54 +0000 (16:15 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 13 Nov 2014 16:15:54 +0000 (16:15 +0000)
commitca58200ab4b0ab5883760460410d07959aeaf58e
tree15a629ac45a28067cd7196eae447e8afa6c24c81
parentd97539352d01f35236e70d4a6950e45f98cbf062
parent815a1d26c2e57e73601fc00b09bfa2f71ffd9300
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop