From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 7 Sep 2015 14:33:45 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~477
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=6672a610d326db688de4adf1e6def0fdb165185b;p=jalview.git

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

6672a610d326db688de4adf1e6def0fdb165185b