Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 20 May 2015 13:41:54 +0000 (14:41 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 20 May 2015 13:41:54 +0000 (14:41 +0100)
commit35b39c5d53fa12b9e9ab497d4a8a665ff3cfef5d
tree97a57986d55d75e9e5e9d2b25a188a73f918454c
parent17fe82c9d7f9da1b17f3091e4b3992a35e3e411e
parentff63e53ccb68842a153d57e74f2bef3833f392f9
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop