Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 12 May 2015 15:35:55 +0000 (16:35 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 12 May 2015 15:35:55 +0000 (16:35 +0100)
commit7c5caa07d0f487073d859589149a91ea2b893105
tree31163dd3fd7bcc8826e415fb58e04ebf5498e9df
parentd62b90cb6effb7b380e5f7d590691dd884b024cf
parentf3b869801edcd73a57ddbb6adbfa02d40652625d
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop