From: Uwe Stöhr <uwestoehr@lyx.org>
Date: Tue, 26 Jul 2016 21:40:34 +0000 (+0200)
Subject: Merge branch '2.2.x' of git.lyx.org:lyx into 2.2.x
X-Git-Tag: 2.2.2~107
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=5e6f9d17532407589f35931da9900758e8543231;p=features.git

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

5e6f9d17532407589f35931da9900758e8543231