From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Fri, 29 May 2015 13:56:48 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~650^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=87a314d8f40b768adfc5302d01a13a2ec08654f4;p=jalview.git

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

87a314d8f40b768adfc5302d01a13a2ec08654f4