From: Jim Procter <jprocter@dundee.ac.uk>
Date: Wed, 4 Jun 2014 16:17:13 +0000 (+0100)
Subject: Merge branch 'develop' into Release_2_8_2_Branch
X-Git-Tag: Release_2_8_2b1^2~79
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=fca189f1ddefa155881dedeeb0f21c1cd0905e74;p=jalview.git

Merge branch 'develop' into Release_2_8_2_Branch
---

fca189f1ddefa155881dedeeb0f21c1cd0905e74