From: Uwe Stöhr <uwestoehr@lyx.org>
Date: Sun, 10 Sep 2017 15:06:00 +0000 (+0200)
Subject: Merge branch '2.3.x' of git.lyx.org:lyx into 2.3.x
X-Git-Tag: 2.3.0rc1~119
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=c7ec2f907cc7faace6343c459d62f7937b09ece9;p=features.git

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

c7ec2f907cc7faace6343c459d62f7937b09ece9