Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 1 Jul 2015 14:53:40 +0000 (15:53 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 1 Jul 2015 14:53:40 +0000 (15:53 +0100)
commit6e79eb7f3978f7e4ab11b7e2aa334a6e9b739996
tree3c0372e3db76da451923b4bb07ae36f967d4a49f
parente5c9a94fcd7765b981e73640626989217276a46a
parentae21643b1d2aa912f1de8b7b0ce3e388860a5493
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop