Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorkiramt <k.mourao@dundee.ac.uk>
Wed, 10 May 2017 13:29:07 +0000 (14:29 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Wed, 10 May 2017 13:29:07 +0000 (14:29 +0100)
commit2ef218faa692153c09a328d40b8f4724d69355f2
tree2c8d6022de73a5b186ff1089556102bfe10111b4
parent5b1eae898349be1d46174125928095053f7e0c70
parent968e71fa2914ce20dd8caca18dd7d4651b636af5
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop