Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Thu, 2 Jun 2016 10:30:36 +0000 (11:30 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Thu, 2 Jun 2016 10:30:36 +0000 (11:30 +0100)
commit7a37a68e3b219cd04563535b1cc64dd55b5f9438
treeedd4f237084e07d11e53a9e39907d303887d4de1
parent30ee33bfe0b3112a25213fa6ae9fb240e132150f
parent1b56e7f2c71c914eec194fb32dd66805a5e9de40
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop

merge