Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 22 Jun 2016 16:03:00 +0000 (17:03 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 22 Jun 2016 16:03:00 +0000 (17:03 +0100)
commit80fa1ace4f6ce0cea9680fd8a6d683270c8b2944
treeecb9143c156310f785c3f14841fbbb5ab5c13268
parentbe1666f6c9be6b18051b233abdde85962ac0c89a
parent579d3d1bccf00ce126ab3574758c6558b1bc3367
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop