From: kiramt <k.mourao@dundee.ac.uk>
Date: Wed, 19 Apr 2017 11:01:30 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/develop' into
X-Git-Tag: Release_2_10_2~3^2~92^2~19
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=484abc22be60686d5188c8ff1b90613e821ea946;p=jalview.git

Merge remote-tracking branch 'origin/develop' into
features/JAL-2388OverviewWindow

Conflicts:
	resources/lang/Messages_es.properties
---

484abc22be60686d5188c8ff1b90613e821ea946