Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorkiramt <k.mourao@dundee.ac.uk>
Mon, 24 Oct 2016 17:29:46 +0000 (18:29 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Mon, 24 Oct 2016 17:29:46 +0000 (18:29 +0100)
commit85fae7bf6cc1e78c966ca0a78194664ad0c1fcac
tree0eb82d9b2028b6edb0e3e31ebf22baddc5cc8382
parentf7061cf12f703969bf3e22fc7e37f5712b9df10a
parent1d123a551af539931e27fb96f4c8e767608bf3ab
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop