From: kjvdheide <kjvanderheide@dundee.ac.uk>
Date: Thu, 5 Oct 2017 11:47:13 +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=60efa06dcbeba37fc76335292bf16ab3c089338e;p=jalview.git

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

60efa06dcbeba37fc76335292bf16ab3c089338e