Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorkiramt <k.mourao@dundee.ac.uk>
Mon, 24 Apr 2017 09:52:12 +0000 (10:52 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Mon, 24 Apr 2017 09:52:12 +0000 (10:52 +0100)
commita5e3847ec3e20a6130c07fb6f6f223c30639a3f2
tree43189ad4315727b9f9a6f2195cbabe8cad51ac9d
parente1c7d8b98cd2f12eee0f6ef14b39df6acda524a9
parent27b32113c6ffa2f60392633eb9f69de96f40d2d5
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop