From: Jim Procter <j.procter@dundee.ac.uk>
Date: Thu, 16 Oct 2014 12:41:05 +0000 (+0100)
Subject: Merge branch 'feature/JAL-674_dssp' into features/JAL-1264_showHideAnnotations
X-Git-Tag: Jalview_2_9~169^2~22^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Ffeatures%2FJAL-1264_showHideAnnotations;p=jalview.git

Merge branch 'feature/JAL-674_dssp' into features/JAL-1264_showHideAnnotations
---

32973e4c3a37dd4485c4190f45bbf43017af40df