Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Thu, 2 Jun 2016 16:36:57 +0000 (17:36 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Thu, 2 Jun 2016 16:36:57 +0000 (17:36 +0100)
commitad4c3976e9f6c26907bd3aa96663e9d8d665bd06
tree2f5fd198c431471a47ad88fe0040c715d8e2c69e
parent0293d494ae19bbd5b5e92ade0cde30292b109f81
parentd8e6d2be6581d41602ddd1348ae9f866d9b5a544
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop

merge