From: kiramt <k.mourao@dundee.ac.uk>
Date: Thu, 9 Feb 2017 15:30:02 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/develop' into features/JAL-2388OverviewWindow
X-Git-Tag: Release_2_10_2~3^2~92^2~72
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=e20cd4d53a73081a49b378f276aa17cd5d7948fb;p=jalview.git

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

e20cd4d53a73081a49b378f276aa17cd5d7948fb