Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 15 Aug 2016 13:54:19 +0000 (14:54 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 15 Aug 2016 13:54:19 +0000 (14:54 +0100)
commit9ee0ce2ec6284a2d57b422ff7d82f30394fe9d8c
tree42ecfc1dfa105b0bea7c4653f948da4784f88ae1
parent7f7f02ea0804ccff0f891f83b05662ab484cf6f1
parent696e49a6749809ff51320f8be0d9344558d2de8a
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop