Merge remote-tracking branch 'origin/bug/JAL-2742' into
authorkiramt <k.mourao@dundee.ac.uk>
Tue, 26 Sep 2017 18:35:30 +0000 (19:35 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Tue, 26 Sep 2017 18:35:30 +0000 (19:35 +0100)
commit7012b60c122812320c562563505e308ce485d7e7
treee55d02dc02455d06603d9a5c1141bb06886a0c7f
parent7c70de6dbc24545b9da5aac77896220d15394fb9
parent4643fc24cc1802814da8653904d8d8b9835395e3
Merge remote-tracking branch 'origin/bug/JAL-2742' into
feature/JAL-2674take2

Conflicts:
src/jalview/datamodel/CigarArray.java
src/jalview/datamodel/CigarArray.java