Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 30 May 2016 13:47:17 +0000 (14:47 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 30 May 2016 13:47:17 +0000 (14:47 +0100)
commit6790716940a46f86f5670294c674eadf8ca6bccf
tree76a4d1e3954d3f9cd29829bd86199699f5284fab
parent528191d2feb45cd42c5b4f48420687346705119d
parentb9545ee44e0b76df7bbaf25607500dcc7b3aa744
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop