From: Jim Procter <jprocter@dundee.ac.uk>
Date: Wed, 23 Apr 2014 15:37:13 +0000 (+0100)
Subject: Merge branch 'jims_marckhacks' into Release_2_8_1_Branch
X-Git-Tag: Release_2_8_1~4^2~18
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=8020522c6122821d7ccab2048ef23a471c8f4b95;p=jalview.git

Merge branch 'jims_marckhacks' into Release_2_8_1_Branch
---

8020522c6122821d7ccab2048ef23a471c8f4b95