From: Jim Procter <jprocter@issues.jalview.org>
Date: Tue, 19 Jul 2016 10:20:03 +0000 (+0100)
Subject: Merge branch 'develop' into efficiency/JAL-2034_JAL-1421
X-Git-Tag: Release_2_10_0~120^2~3
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=ebca5f7880f838a5564dd419274ad6025b456dab;hp=ebca5f7880f838a5564dd419274ad6025b456dab;p=jalview.git

Merge branch 'develop' into efficiency/JAL-2034_JAL-1421
---