From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Wed, 1 Jul 2015 14:23:19 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
X-Git-Tag: Release_2_10_0~585^2~2^2~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=ae21643b1d2aa912f1de8b7b0ce3e388860a5493;p=jalview.git

Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
---

ae21643b1d2aa912f1de8b7b0ce3e388860a5493