From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Tue, 18 Aug 2015 10:47:46 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
X-Git-Tag: Release_2_10_0~535
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=65c69ee458f7146ad6e2e402d34e294e81ec0010;p=jalview.git

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

65c69ee458f7146ad6e2e402d34e294e81ec0010