From: Jim Procter <jprocter@issues.jalview.org>
Date: Tue, 21 Jun 2016 13:53:15 +0000 (+0100)
Subject: Merge branch 'features/JAL-1956_featureStyles' into merge_JAL-1956
X-Git-Tag: Release_2_10_0~161^2~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=57a942fc12f3e28a1924eed91f05abe31936dd14;p=jalview.git

Merge branch 'features/JAL-1956_featureStyles' into merge_JAL-1956
---

57a942fc12f3e28a1924eed91f05abe31936dd14