Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorkiramt <k.mourao@dundee.ac.uk>
Thu, 23 Mar 2017 20:40:10 +0000 (20:40 +0000)
committerkiramt <k.mourao@dundee.ac.uk>
Thu, 23 Mar 2017 20:40:10 +0000 (20:40 +0000)
commite48d34b3938b4ac05a3dcaf3ab29e6317080f229
treeb0f0ae01ca170b727bce0f6ee522db2b472dd48b
parent4f6eaa801f36f7b460b662af6a24c45c1947dbd1
parent844c332f108aba635608f13dedf2b08777b3a477
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop