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

Merge branch 'develop' into develop_m2_8_1_2
---

8097b4af546593987e91a50b301f35e0ef422d58