From: Jim Procter <jprocter@issues.jalview.org>
Date: Thu, 10 Sep 2015 10:14:27 +0000 (+0100)
Subject: Merge branch 'develop' into Release_2_9_Branch
X-Git-Tag: Jalview_2_9~4
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=8872ca6bcf761214bb3b4f428adec48bba95d80e;hp=-c;p=jalview.git

Merge branch 'develop' into Release_2_9_Branch
---

8872ca6bcf761214bb3b4f428adec48bba95d80e