From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 23 Mar 2016 15:37:53 +0000 (+0000)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~288^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=0f61ed3a492c115c5047fc862104111d83b62256;hp=-c;p=jalview.git

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

0f61ed3a492c115c5047fc862104111d83b62256