From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 11 Jan 2016 14:58:24 +0000 (+0000)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~326^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=5b079109d33a4596a8c3017dbf93b7de5b0300c5;p=jalview.git

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

5b079109d33a4596a8c3017dbf93b7de5b0300c5