From: Jim Procter <jprocter@compbio.dundee.ac.uk>
Date: Tue, 18 Jun 2013 16:12:41 +0000 (+0100)
Subject: Merge branch 'menard' into develop_m2_8_1_2
X-Git-Tag: Jalview_2_9~221^2^2~8
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=63874e48e999c58990d1f5fa18d40417306d276b;p=jalview.git

Merge branch 'menard' into develop_m2_8_1_2
---

63874e48e999c58990d1f5fa18d40417306d276b