From: Jim Procter <jprocter@issues.jalview.org>
Date: Mon, 18 Dec 2017 05:36:34 +0000 (+1300)
Subject: Merge branch 'kjvdh/features/testing' into spikes/koen
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=126d3237c583c793ad78c02b8cc9e6f7bb61e146;p=jalview.git

Merge branch 'kjvdh/features/testing' into spikes/koen
---

126d3237c583c793ad78c02b8cc9e6f7bb61e146