From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 11 Mar 2015 11:27:44 +0000 (+0000)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=ba2f5105391c4421c9d74e5f63505e2a291035b0;p=jalview.git

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

ba2f5105391c4421c9d74e5f63505e2a291035b0