From: kjvdheide <kjvanderheide@dundee.ac.uk>
Date: Tue, 24 Oct 2017 08:17:45 +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=1d99bdfeadca1e367fa1102e826592e90c35ed9e;p=jalview.git

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

1d99bdfeadca1e367fa1102e826592e90c35ed9e