From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Fri, 26 Aug 2016 11:15:06 +0000 (+0100)
Subject: Merge branch 'develop' into bug/JAL-1841rnaSecStr
X-Git-Tag: Release_2_10_0~70^2~2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=0ca96db9937136626dcd867e122d1762b28e15bd;p=jalview.git

Merge branch 'develop' into bug/JAL-1841rnaSecStr
---

0ca96db9937136626dcd867e122d1762b28e15bd