From: jprocter <jprocter@compbio.dundee.ac.uk>
Date: Sat, 17 Nov 2012 21:58:30 +0000 (+0000)
Subject: Merge branch 'master' into Release_2_8_Branch
X-Git-Tag: Release_2_8_0b1~1^2~76
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=d1996d82c61da9a1b97fce6dc0020da96d0f3f16;p=jalview.git

Merge branch 'master' into Release_2_8_Branch
---

d1996d82c61da9a1b97fce6dc0020da96d0f3f16