From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 28 Oct 2014 15:52:53 +0000 (+0000)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Jalview_2_9~162
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=8ba65cbf8dde2faeff8a84eae78127fb99b765a5;p=jalview.git

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

8ba65cbf8dde2faeff8a84eae78127fb99b765a5