From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Fri, 16 Dec 2016 14:40:59 +0000 (+0000)
Subject: Merge branch 'develop' into bug/JAL-2346annotationChoice
X-Git-Tag: Release_2_10_3b1~336^2~2^2~1^2~2^2~8
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=a66859d7d906916f2310ad01cc065d6cfa2506f4;p=jalview.git

Merge branch 'develop' into bug/JAL-2346annotationChoice
---

a66859d7d906916f2310ad01cc065d6cfa2506f4