From: Jim Procter <j.procter@dundee.ac.uk>
Date: Tue, 21 Oct 2014 16:36:34 +0000 (+0100)
Subject: Merge branch 'forpush/JAL-674_dssp' into develop
X-Git-Tag: Jalview_2_9~165^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=ccba52c9ce5523bc2f1ff5873fa559a7eb3016ae;p=jalview.git

Merge branch 'forpush/JAL-674_dssp' into develop
---

ccba52c9ce5523bc2f1ff5873fa559a7eb3016ae