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

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

514a7c485f6e779c68478aa1f020bf96778bf87d