Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 29 Nov 2016 13:25:45 +0000 (13:25 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 29 Nov 2016 13:25:45 +0000 (13:25 +0000)
commitb3ff575126349c79f25dcba8526ed8828d668db1
tree310d3cdae5f2d059b081dd2fccfebefc61b78ccb
parent2b6a2fdd887521f16ec777aab3126d6209f2a0a6
parent65ca0d6bf58ffa46a395cf1d66e40275626068e5
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop