From: Jim Procter <jprocter@dundee.ac.uk>
Date: Tue, 2 Dec 2014 13:22:20 +0000 (+0000)
Subject: Merge branch 'JAL-1517_release282' into Release_2_8_2_Branch
X-Git-Tag: Release_2_8_2~1^2~6
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=da03c490b1cb9576a40430a477d093fbbecc8378;hp=da03c490b1cb9576a40430a477d093fbbecc8378;p=jalview.git

Merge branch 'JAL-1517_release282' into Release_2_8_2_Branch
---