From: Jim Procter <jprocter@dundee.ac.uk>
Date: Mon, 21 Apr 2014 16:42:05 +0000 (+0100)
Subject: Merge branch 'jims_marckhacks' into develop
X-Git-Tag: Jalview_2_9~198
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=5407cbf8c0055ac748b42c8a86097e3d5edec3e7;p=jalview.git

Merge branch 'jims_marckhacks' into develop
---

5407cbf8c0055ac748b42c8a86097e3d5edec3e7