Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 12 Sep 2016 08:12:09 +0000 (09:12 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 12 Sep 2016 08:12:09 +0000 (09:12 +0100)
commit2f0ce1f46c5bb22e1db18c27e68b09516958c84d
tree098b95cc7f745b22bb7e342016a5e74aa1f9c06d
parentd6a7a52ed783274ebf338417af48cd931cfba60e
parent4687a9d3adb02abca831fbb119a54153bc2a19ca
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop