From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 17 Aug 2015 15:26:20 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~535^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=195951ef78cb23b658fa05149eb87573878ef388;p=jalview.git

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

195951ef78cb23b658fa05149eb87573878ef388