From: jprocter <jprocter@compbio.dundee.ac.uk>
Date: Tue, 5 Jul 2011 11:24:24 +0000 (+0100)
Subject: Merge branch 'master' of https://source.jalview.org/git/jalview
X-Git-Tag: Release_2_7~150
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=906214d1ea5b8d83235565ec85f02a9955413353;p=jalview.git

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

906214d1ea5b8d83235565ec85f02a9955413353