From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 4 May 2016 15:22:53 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git
X-Git-Tag: Release_2_10_0~227^2~5
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=f74464fb7f5f0e905d64a497e10bcdf0d6e7decb;p=jalview.git

Merge branch 'develop' of https://source.jalview.org/git/jalview.git
into develop

Conflicts:
	lib/xercesImpl.jar
---

f74464fb7f5f0e905d64a497e10bcdf0d6e7decb