From: kiramt <k.mourao@dundee.ac.uk>
Date: Fri, 14 Jul 2017 09:01:25 +0000 (+0100)
Subject: Merge branch 'feature/JAL-2613' into feature/JAL-2611
X-Git-Tag: Release_2_10_3b1~132^2~30^2~6
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=9db5c5efc51b819623790eaf1b7145dd2936d029;hp=9db5c5efc51b819623790eaf1b7145dd2936d029;p=jalview.git

Merge branch 'feature/JAL-2613' into feature/JAL-2611

Conflicts:
	src/jalview/viewmodel/OverviewDimensions.java
---