From: Jim Procter <jprocter@issues.jalview.org>
Date: Tue, 8 Sep 2015 17:02:26 +0000 (+0100)
Subject: Merge branch 'develop' into release/2_9_documentation
X-Git-Tag: Release_2_10_0~457^2~5
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=9cf2285dee92b3e12e818261503a575d45f02cc2;p=jalview.git

Merge branch 'develop' into release/2_9_documentation
---

9cf2285dee92b3e12e818261503a575d45f02cc2