Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 26 Apr 2016 10:41:35 +0000 (11:41 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 26 Apr 2016 10:41:35 +0000 (11:41 +0100)
commit659cdd6d20a562ff4a856f2325399f2dbb398126
tree701d3257e2cd503476a484f79e876499522a2213
parent49a16230c3aa7081afe8a6c502bac36b46b25eee
parent24fb77e77301499aa9e4e12d40d2ab42e06f56ca
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop