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

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

e5de79c465d379dff481dbb45d2c3cd9deb72a85