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

Merge branch 'develop' into develop_m2_8_1_2
---

7f3ee80b1dac4fa99bb0ea0c3af92046bec43a77