From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Mon, 1 May 2017 14:47:15 +0000 (+0100)
Subject: Merge branch 'develop' into spikes/phyre
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=496e2a7b7be5201d8739523b95fce5899e71aa8a;p=jalview.git

Merge branch 'develop' into spikes/phyre
---

496e2a7b7be5201d8739523b95fce5899e71aa8a