From: Jim Procter <jprocter@issues.jalview.org>
Date: Mon, 4 Jul 2016 10:38:02 +0000 (+0100)
Subject: Merge branch 'develop' into spike/JAL-2040_JAL-2137_phyre2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=1e2d0cb3851160eb3e7ba9ec39a04a28a82e57e9;p=jalview.git

Merge branch 'develop' into spike/JAL-2040_JAL-2137_phyre2
---

1e2d0cb3851160eb3e7ba9ec39a04a28a82e57e9