From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Mon, 20 Jun 2016 11:07:33 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
X-Git-Tag: Release_2_10_0~164
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=c7633fc4fc9799d9a906c8b60b3e3981a2c0b4fb;p=jalview.git

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

c7633fc4fc9799d9a906c8b60b3e3981a2c0b4fb