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

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

ac8d1df7e4ad0cb6a2e0119b132440c3f439d17c