From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 23 May 2016 08:02:14 +0000 (+0100)
Subject: Merge branch 'develop' into features/JAL-2113_emblXml1.2
X-Git-Tag: Release_2_10_0~196^2~2^2~6
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=e1d9f73a2e2489b2213b9f54a7b4170b8e70cad6;hp=-c;p=jalview.git

Merge branch 'develop' into features/JAL-2113_emblXml1.2
---

e1d9f73a2e2489b2213b9f54a7b4170b8e70cad6