From: Jim Procter <jprocter@issues.jalview.org>
Date: Thu, 10 Sep 2015 10:06:46 +0000 (+0100)
Subject: Merge branch 'develop' into Release_2_9_Branch
X-Git-Tag: Jalview_2_9~5
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=141040cac1e8570634a25ad6a5550a56558041fb;p=jalview.git

Merge branch 'develop' into Release_2_9_Branch
---

141040cac1e8570634a25ad6a5550a56558041fb