From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Fri, 29 May 2015 15:41:21 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
X-Git-Tag: Release_2_10_0~650
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=c08c3fe3039b510382eb9caa81c30c059c15ce13;p=jalview.git

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

c08c3fe3039b510382eb9caa81c30c059c15ce13