From: Jim Procter <j.procter@dundee.ac.uk>
Date: Mon, 6 Oct 2014 11:46:56 +0000 (+0100)
Subject: Merge branch 'feature/JAL-654_dssp' into Release_2_8_2_Branch
X-Git-Tag: Release_2_8_2b1^2~49
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=911c6630cec6fa5253821a7e18a13d0d4df3627c;p=jalview.git

Merge branch 'feature/JAL-654_dssp' into Release_2_8_2_Branch
---

911c6630cec6fa5253821a7e18a13d0d4df3627c