Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 22 Jun 2016 13:00:08 +0000 (14:00 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 22 Jun 2016 13:00:08 +0000 (14:00 +0100)
commit7d5689aed049c21875c6976945a17ab3dd9d5667
treeabadf19af6e55a1f1abfc920e7d8821a0fa6908a
parentf45b2d150315264f33869837a680667192acc421
parentf2b86d72de53efb41fd1d57335fb0a61a9efe3ea
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop