Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 19 Sep 2018 12:44:58 +0000 (13:44 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 19 Sep 2018 12:44:58 +0000 (13:44 +0100)
commit790ae3a67afce3779c0a064efb7814df2dffb7c0
treec6bbb67b6766b8f767b1eb59abed059fcbe27ec1
parent28c232b27469433dd85d3a09ecf8b6e2ff09eead
parent0bf4021c843f30b0488422c2a736e7a14e65b6ff
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop