Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 8 Jul 2015 12:19:14 +0000 (13:19 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 8 Jul 2015 12:19:14 +0000 (13:19 +0100)
commitf0abe70b5a54b6a9730aa5f4e2bf2bd697508757
treecb74fe16d4a1ed935771f43170f8c961d04366f3
parent9c5872525e4587979d60c2a7ca93d1e527fae5c1
parent1ba05544b34253204ef6410017a179c31fe5e23d
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop