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

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

e3cb01d93441b733ea7bcfcd6b11168908c37484