From: kjvdheide <kjvanderheide@dundee.ac.uk>
Date: Tue, 28 Nov 2017 17:47:50 +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=0cc821da5ece219b05bc01acccfbd7ac415f37b7;p=jalview.git

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

0cc821da5ece219b05bc01acccfbd7ac415f37b7