Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorkiramt <k.mourao@dundee.ac.uk>
Tue, 19 Sep 2017 14:05:01 +0000 (15:05 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Tue, 19 Sep 2017 14:05:01 +0000 (15:05 +0100)
commitb640bc44f5446055337fa4b00c434e7e2db6f443
treed8e734fba0f8f051b1006f6133a454848deffc8a
parent8f0648a4f7bb05cf8f59fe9c70c6841992ebbd2e
parent317cd8683c63294c5f13324209a069b287b02477
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop