From: jprocter <jprocter@compbio.dundee.ac.uk>
Date: Tue, 17 May 2011 09:07:32 +0000 (+0100)
Subject: Merge branch 'master' of https://source.jalview.org/git/jalview
X-Git-Tag: Release_2_7~188
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=62229e73eabf0e431f1e159042cfeab882f7a7dc;p=jalview.git

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

62229e73eabf0e431f1e159042cfeab882f7a7dc