JAL-2079 fix broken cherry-pick conflict merge
authorJim Procter <jprocter@issues.jalview.org>
Tue, 26 Apr 2016 17:25:36 +0000 (18:25 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 26 Apr 2016 17:25:36 +0000 (18:25 +0100)

No differences found