Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 26 May 2016 13:05:02 +0000 (14:05 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 26 May 2016 13:05:02 +0000 (14:05 +0100)
commitb2812af7b64b3ee81d0c5a50ff9a2cd0bcbd0de1
treee36042ac74eedff320a40394dd777f0d63394aca
parent15d61556bb004b6f5707523942a1ef5d93ec416d
parente879efcd79694e43a8081c9235a13740cb429076
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop