From: Jim Procter <j.procter@dundee.ac.uk>
Date: Mon, 6 Oct 2014 15:18:42 +0000 (+0100)
Subject: Merge branch 'patch/JAL-1286_JAL-1265' into Release_2_8_2_Branch
X-Git-Tag: Release_2_8_2b1^2~48
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=deff1a0f2a6dbcf087b4f6541e2fc7284a382b66;p=jalview.git

Merge branch 'patch/JAL-1286_JAL-1265' into Release_2_8_2_Branch
---

deff1a0f2a6dbcf087b4f6541e2fc7284a382b66