From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 21 Mar 2016 16:46:41 +0000 (+0000)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~290^2~4
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=3aeb6895bb7be6a0e138e2071b32ba98b3fbe336;p=jalview.git

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

3aeb6895bb7be6a0e138e2071b32ba98b3fbe336