Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 24 Aug 2015 08:25:22 +0000 (09:25 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 24 Aug 2015 08:25:22 +0000 (09:25 +0100)
commite3cb01d93441b733ea7bcfcd6b11168908c37484
treef78eb4f9f194802fa64f79f5c68b1cbd81cd09e3
parentb3d648f529f35f8b7d67292b8be709bce9c8439d
parent19dae30f7acd7a93c432909db03a3373ded74e20
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop