From: Jim Procter <j.procter@dundee.ac.uk>
Date: Mon, 6 Oct 2014 11:47:08 +0000 (+0100)
Subject: Merge branch 'feature/JAL-654_dssp' into develop
X-Git-Tag: Jalview_2_9~174
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=128fac689c56ad84e307fd1dad8bd8c2be17fbb6;p=jalview.git

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

128fac689c56ad84e307fd1dad8bd8c2be17fbb6