From: Jim Procter <jprocter@dundee.ac.uk>
Date: Thu, 30 Oct 2014 17:05:36 +0000 (+0000)
Subject: Merge branch 'develop' into features/ssFromPDBEntry
X-Git-Tag: Jalview_2_9~155^2~15^2~11
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=0b7943691883db09c5dd85e525bfc95539f15566;p=jalview.git

Merge branch 'develop' into features/ssFromPDBEntry
---

0b7943691883db09c5dd85e525bfc95539f15566