From: Jim Procter <jprocter@compbio.dundee.ac.uk>
Date: Sun, 9 Jun 2013 14:31:39 +0000 (+0100)
Subject: Merge branch 'develop' into develop_m2_8_1_2
X-Git-Tag: Jalview_2_9~221^2^2~15
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=8ae2f7862cf3b22994d79fac1e5a3f0932079378;p=jalview.git

Merge branch 'develop' into develop_m2_8_1_2
---

8ae2f7862cf3b22994d79fac1e5a3f0932079378