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

Merge branch 'develop' into develop_m2_8_1_2
---

71175b4578ef89961a7846ef7777b83fc7808b0d