Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 29 May 2015 13:56:48 +0000 (14:56 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 29 May 2015 13:56:48 +0000 (14:56 +0100)
commit87a314d8f40b768adfc5302d01a13a2ec08654f4
tree1a82c6f76958df433643404bae09e63b1a0cbbe5
parent6746132759f6de25a29c113c724e805d114c9c1d
parent16bd1f9daaa35dd5b87de17a649116f9d33927b8
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop