Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 17 Aug 2015 10:05:19 +0000 (11:05 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 17 Aug 2015 10:05:19 +0000 (11:05 +0100)
commit57b9a2586fca91079a25bc127f15a74fdc250ac3
tree713b59121d1159df41bb78e3ee5af3887b78e13a
parent2a8b7c0e301a7693a7a556adb567d7efff2af8ac
parent8e2f91c6975f077f4313a516a46a5a42b6388b3a
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop