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

Merge branch 'develop' into develop_m2_8_1_2
---

5c7270777750369b2deed5b7e33eb6ae361eb6c8