From: Jim Procter <jprocter@issues.jalview.org>
Date: Mon, 15 Jun 2015 12:37:44 +0000 (+0100)
Subject: Merge branch 'develop' into bug/JAL-1775
X-Git-Tag: Release_2_10_0~608^2~3
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=c75ae0da287834282173560815959c4b4e7e6b2d;hp=-c;p=jalview.git

Merge branch 'develop' into bug/JAL-1775
---

c75ae0da287834282173560815959c4b4e7e6b2d