From: Uwe Stöhr <uwestoehr@lyx.org>
Date: Mon, 9 Feb 2015 00:15:23 +0000 (+0100)
Subject: Merge branch '2.1.x' of git.lyx.org:lyx into 2.1.x
X-Git-Tag: 2.1.4~242
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=2c3f673c32b2a50734b8427bcbbe4fd205dc3717;p=features.git

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

2c3f673c32b2a50734b8427bcbbe4fd205dc3717