From: Jim Procter <jprocter@dundee.ac.uk>
Date: Wed, 23 Apr 2014 15:37:53 +0000 (+0100)
Subject: Merge branch 'jims_marckhacks' into develop
X-Git-Tag: Jalview_2_9~197
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=9e00a71bcb54f0bcfcd082ae1660a1c9fdf9d4ed;p=jalview.git

Merge branch 'jims_marckhacks' into develop
---

9e00a71bcb54f0bcfcd082ae1660a1c9fdf9d4ed