From: Jim Procter <jprocter@issues.jalview.org>
Date: Mon, 9 Oct 2017 13:47:00 +0000 (+0100)
Subject: Merge branch 'patch/JAL-2446_mergeconflictmissed' into develop
X-Git-Tag: Release_2_10_3b1~117
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2f7a43c60eb2bbbb907240c6320ab11d41227c02;p=jalview.git

Merge branch 'patch/JAL-2446_mergeconflictmissed' into develop
---

2f7a43c60eb2bbbb907240c6320ab11d41227c02