From: Jim Procter <jprocter@compbio.dundee.ac.uk>
Date: Sun, 7 Jul 2013 12:20:30 +0000 (+0100)
Subject: Merge branch 'develop' into develop_m2_8_1_2
X-Git-Tag: Jalview_2_9~221^2^2~2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=4be17e69d8ecd4fdd8fab5e0a92186f1ec7d7eea;p=jalview.git

Merge branch 'develop' into develop_m2_8_1_2
---

4be17e69d8ecd4fdd8fab5e0a92186f1ec7d7eea