From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 17 Jun 2015 07:50:13 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~606
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=a4b8cec2530a9ebd51fecc1abcc4152fc778908b;p=jalview.git

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

a4b8cec2530a9ebd51fecc1abcc4152fc778908b