From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Mon, 21 Nov 2016 13:03:50 +0000 (+0000)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
X-Git-Tag: Release_2_10_1~11^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=1115610f184fa6014322a4cd9e1ce4c534e29eab;hp=-c;p=jalview.git

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

1115610f184fa6014322a4cd9e1ce4c534e29eab