From: Uwe Stöhr <uwestoehr@lyx.org>
Date: Thu, 14 Dec 2017 13:49:16 +0000 (+0100)
Subject: Merge branch '2.3.x' of git.lyx.org:lyx into 2.3.x
X-Git-Tag: 2.3.0rc2~164
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=a0130c343b9410b52811fb8aa7fb06bd346badc2;p=features.git

Merge branch '2.3.x' of git.lyx.org:lyx into 2.3.x
---

a0130c343b9410b52811fb8aa7fb06bd346badc2