From: Uwe Stöhr <uwestoehr@lyx.org>
Date: Fri, 21 Oct 2016 23:00:23 +0000 (+0200)
Subject: Merge branch '2.2.x' of git.lyx.org:lyx into 2.2.x
X-Git-Tag: 2.2.3~216
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=e178eb864a6728d094d17637ead928aea49dcac8;p=features.git

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

e178eb864a6728d094d17637ead928aea49dcac8