Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 29 Jun 2016 11:34:51 +0000 (12:34 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 29 Jun 2016 11:34:51 +0000 (12:34 +0100)
commit8dfdafee89d06dd397c392619b4b285f0dc35430
treed7ed468751cf85878a827f953376e1b882ce33d7
parent7c621eb034de40a389393ae4a97762328f5b3046
parent8f5031f8cc3b6da5ce8d639a5b6e0365c1904623
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop