From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 21 Apr 2016 09:56:53 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~249^2~17
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=49d07daba32cb7ca7841eca72c82cdf3c8d4344d;p=jalview.git

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

49d07daba32cb7ca7841eca72c82cdf3c8d4344d