From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Fri, 5 Dec 2014 08:38:37 +0000 (+0000)
Subject: Merge branch 'Release_2_8_2_Branch' of local repository into features/JAL-1596ChimeraREST
X-Git-Tag: Jalview_2_9~124^2~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b12200cd43693a8d3b3a3609444ffbc04eb14f7b;p=jalview.git

Merge branch 'Release_2_8_2_Branch' of local repository into features/JAL-1596ChimeraREST
---

b12200cd43693a8d3b3a3609444ffbc04eb14f7b