From: Jim Procter <jprocter@dundee.ac.uk>
Date: Mon, 21 Apr 2014 13:24:56 +0000 (+0100)
Subject: Merge branch 'jims_marckhacks' into Release_2_8_1_Branch
X-Git-Tag: Release_2_8_1~4^2~20
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=4347e10c9766f04ef79a52f7ff5606fbd872b8be;hp=7c7a5a297e063d3892dd7e629bc317cdde837b81;p=jalview.git

Merge branch 'jims_marckhacks' into Release_2_8_1_Branch
---