From: Jim Procter <jprocter@issues.jalview.org>
Date: Thu, 10 Sep 2015 02:42:05 +0000 (+0100)
Subject: Merge branch 'develop' into release/2_9_documentation
X-Git-Tag: Release_2_10_0~438
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=322603c39c5e60e4f7a6923ffa4695bc7d3576c4;p=jalview.git

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

322603c39c5e60e4f7a6923ffa4695bc7d3576c4