Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 24 Aug 2015 12:05:32 +0000 (13:05 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 24 Aug 2015 12:05:32 +0000 (13:05 +0100)
commit7ae80b3ef4d1fa895a0e711ae308863a22f8333c
treee33ec00410652ed6c8f93d1e73fa8937a84f89bc
parent612d6d9a9b5158a45c059e7448238a0b64bb2962
parente0c89aee9888087ab0acc787b1cec20f2f30b56d
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop