From: Jim Procter <jprocter@issues.jalview.org>
Date: Thu, 27 Apr 2017 10:11:48 +0000 (+0100)
Subject: Merge branch 'develop' into features/JAL-1933_occupancy
X-Git-Tag: Release_2_10_2~3^2~124^2~7
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=5a74603b846dae238eaca8c1a8aa5bab64ab3c2c;p=jalview.git

Merge branch 'develop' into features/JAL-1933_occupancy
---

5a74603b846dae238eaca8c1a8aa5bab64ab3c2c