From: Jim Procter <jprocter@issues.jalview.org>
Date: Fri, 4 Aug 2017 08:12:35 +0000 (+0100)
Subject: Merge branch 'develop' into documentation/JAL-2418_release2102
X-Git-Tag: Release_2_10_2~3^2~15^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=751c4a3adbd5d126995cd805e5afa5c9ceb3a0bd;hp=2d7eccf2eb726fd48b14aad81daff8a408fe7791;p=jalview.git

Merge branch 'develop' into documentation/JAL-2418_release2102
---