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

Merge branch 'develop' into develop_m2_8_1_2
---