From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 13 Nov 2014 16:15:54 +0000 (+0000)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Jalview_2_9~155
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=ca58200ab4b0ab5883760460410d07959aeaf58e;p=jalview.git

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

ca58200ab4b0ab5883760460410d07959aeaf58e