Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Thu, 2 Jun 2016 10:29:21 +0000 (11:29 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Thu, 2 Jun 2016 10:29:21 +0000 (11:29 +0100)
commit30ee33bfe0b3112a25213fa6ae9fb240e132150f
tree1eabc41336c2b6d4837dab01ad1522a42f389ac9
parent63fe4d2b85bb9c1312a1313e27c899d1b30de4c0
parenta4fbdb84a6f4ce8e563e88bd065581ab4fc7ca9a
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop

merge