Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 13 Sep 2016 14:52:11 +0000 (15:52 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 13 Sep 2016 14:52:11 +0000 (15:52 +0100)
commit3ab17dd3059304edf244a2282504dc5b218ba268
tree1443801cdb4ef46d815c0bd8688c8c2e5f4a2fb6
parent3becb23b055e6b17b372c04be015bb205251ae9f
parent13bc8a3fb89b083922d9fa9dad5050e6aaa1f661
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop