Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 21 Mar 2016 16:46:41 +0000 (16:46 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 21 Mar 2016 16:46:41 +0000 (16:46 +0000)
commit3aeb6895bb7be6a0e138e2071b32ba98b3fbe336
tree118aed241f06dea8b8441bd89a9457bd0bdffdab
parent0b5052263d15d96de06a687e90ad1eef0d4462e6
parent015cc504f1f1239955b2b5995f1b3193c67562a8
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop