Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 7 Sep 2015 14:33:45 +0000 (15:33 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 7 Sep 2015 14:33:45 +0000 (15:33 +0100)
commit6672a610d326db688de4adf1e6def0fdb165185b
tree5046c40fa1a3e9d478a9491ddc9f22a687171d85
parent6b106f39c410cbb2b1714b905948d68b91a341dd
parent2098a59fd8d77029fbbf8509a27926deb3d63c54
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop