From: kjvdheide <kjvanderheide@dundee.ac.uk>
Date: Thu, 26 Oct 2017 20:36:34 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=1750fec5e3d2a9c626481fac2b7f20fb2812db48;p=jalview.git

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

Conflicts:
	src/jalview/gui/TreePanel.java
---

1750fec5e3d2a9c626481fac2b7f20fb2812db48