Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 14 Apr 2016 11:00:38 +0000 (12:00 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 14 Apr 2016 11:00:38 +0000 (12:00 +0100)
commit4a852a001a4c47bf61991296458928e58affe02f
tree24ad9e8d810435a87b681e2ab0aa1b72dcdf7377
parent45bc22d39b6ab677a8fcd2d957fd5db79675f962
parent9b881d499996272c2a9063016836e9b5f6f66d60
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop