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

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

17dfd212b89123210a95ee7638e3a5374cf41fb3