From: Jim Procter <jprocter@compbio.dundee.ac.uk>
Date: Fri, 21 Jun 2013 13:13:11 +0000 (+0100)
Subject: Merge branch 'develop' into develop_m2_8_1_2
X-Git-Tag: Jalview_2_9~221^2^2~4
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=259d9c2e927a4a241660e093da6aa8e99a223a0d;p=jalview.git

Merge branch 'develop' into develop_m2_8_1_2
---

259d9c2e927a4a241660e093da6aa8e99a223a0d