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

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

12f07d8817c2495feb46dc344de946f234313167