Merge branch 'develop' of https://source.jalview.org/git/jalview.git
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 4 May 2016 15:22:53 +0000 (16:22 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 4 May 2016 15:22:53 +0000 (16:22 +0100)
commitf74464fb7f5f0e905d64a497e10bcdf0d6e7decb
treea82fbe3f63c35f70692b7bb571cbfb1ab6a08167
parentcc7f77e40e9dc46ceaadf4e95ef55854ab4a8ea5
parent6eadc41ac04f3ab9d865d0d5367a24eb0032f4d9
Merge branch 'develop' of https://source.jalview.org/git/jalview.git
into develop

Conflicts:
lib/xercesImpl.jar