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

Merge branch 'develop' into develop_m2_8_1_2
---

ce88ceb6f21ed9c5b1e5fb88dd38dc8f65a43379