From: kjvdheide <kjvanderheide@dundee.ac.uk>
Date: Tue, 19 Dec 2017 12:15:50 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/spikes/koen' into kjvdh/features/testing
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=0aaaa7b31eca9b44db70bfff32373db65cd1ca3b;p=jalview.git

Merge remote-tracking branch 'origin/spikes/koen' into kjvdh/features/testing
---

0aaaa7b31eca9b44db70bfff32373db65cd1ca3b