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

Merge branch 'develop' into develop_m2_8_1_2
---

fa21f9cf6810d32bfd3c9b6c26ac8134a41ede12