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

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

b3e7a31595ec48c21e203f414fcd7fe7d3f0c329