Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 19 Jul 2016 11:49:48 +0000 (12:49 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 19 Jul 2016 11:49:48 +0000 (12:49 +0100)
commitf642f166c0eeb010c9f5006d8450f83390924b8a
tree8ab320cb143459d26adcf6a79a35e6adb4b2c954
parent0555b298d22be533a0a67a3cd0ce2db883bae8bd
parent2a5bc21c7dde626c7c99e98d5b8f6bfba736f738
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop