Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 22 Aug 2017 12:36:28 +0000 (13:36 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 22 Aug 2017 12:36:28 +0000 (13:36 +0100)
commit17d48a9d85ad1feb5074dbf605f54cfd399ca59b
treef91e17abef2c7584531ff6251da68171335e4c63
parent5779b71c22d85070cbb59aa51a612d03f9744cc3
parent3b837cb360251a18429609ed777a0386d220fa31
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop