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

Merge branch 'develop' into develop_m2_8_1_2
---

d8232345a26479946d14ff3f47f9a635a5a8df76