From: kjvdheide <kjvanderheide@dundee.ac.uk>
Date: Fri, 27 Oct 2017 15:43:24 +0000 (+0100)
Subject: Merge branch 'JalviewIntegration' of file:////Users/kjvanderheide/Documents/Archae... 
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=d62c120f4c6fb10f20abaa929514d980fcea9671;p=jalview.git

Merge branch 'JalviewIntegration' of file:////Users/kjvanderheide/Documents/Archae/forester into JalviewIntegration
---

d62c120f4c6fb10f20abaa929514d980fcea9671