From: kjvdheide <kjvanderheide@dundee.ac.uk>
Date: Tue, 5 Dec 2017 10:06:24 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/develop' into kjvdh/features/PhylogenyViewer
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=fb7157fc6eba236befce7daac432fc338f2de458;p=jalview.git

Merge remote-tracking branch 'origin/develop' into kjvdh/features/PhylogenyViewer
---

fb7157fc6eba236befce7daac432fc338f2de458