From: kjvdheide <kjvanderheide@dundee.ac.uk>
Date: Wed, 25 Oct 2017 14:51:38 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/featu... 
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=a94f60273c1c21fda47b1a599a17e4fc920fe4a3;p=jalview.git

Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/features/PhylogenyViewer
---

a94f60273c1c21fda47b1a599a17e4fc920fe4a3