Merge branch 'Jalview-BH/JAL-3026' into tasks/JAL-3033_jalviewjs_ant
authorJim Procter <jprocter@issues.jalview.org>
Mon, 25 Jun 2018 10:48:11 +0000 (11:48 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 25 Jun 2018 10:48:11 +0000 (11:48 +0100)

Trivial merge