From: kiramt <k.mourao@dundee.ac.uk>
Date: Thu, 11 Jan 2018 17:28:29 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/task/JAL-2662' into develop
X-Git-Tag: Release_2_10_3b1~3^2~7
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=5eeb49c62b1004b1efe837a543c8ff84aa6d7faf;hp=5eeb49c62b1004b1efe837a543c8ff84aa6d7faf;p=jalview.git

Merge remote-tracking branch 'origin/task/JAL-2662' into develop

Conflicts:
	benchmarking/README
---