From: Jim Procter <jprocter@issues.jalview.org>
Date: Tue, 15 Aug 2017 13:54:20 +0000 (+0100)
Subject: Merge branch 'develop' into documentation/JAL-2418_release2102
X-Git-Tag: Release_2_10_2~3^2~3^2^2~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b9312fcb8dd554b3d25b52b6ff4c2ecb6e08d992;hp=b9312fcb8dd554b3d25b52b6ff4c2ecb6e08d992;p=jalview.git

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