Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 3 Sep 2015 10:37:28 +0000 (11:37 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 3 Sep 2015 10:37:28 +0000 (11:37 +0100)
commitd8d49ee2a757173fa4417af5e42cc16023e0ae09
tree316d60ee17365d4b616da5c6bbc634db9f9e060f
parent4316d4573368e1c5455f84c6fcb96aa3a1e48045
parentac16d57bd5c4a52189a1487f64422091b91ba935
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop