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

Merge branch 'develop' into develop_m2_8_1_2
---

a4462f60912bbb2661b5d3b444781e34563aeb67