From: Uwe Stöhr <uwestoehr@lyx.org>
Date: Sun, 29 May 2016 21:58:10 +0000 (+0200)
Subject: Merge branch 'master' of git.lyx.org:lyx
X-Git-Tag: 2.3.0alpha1~1643
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b917c4e40f9f5cd3d101444600eddafcca54d6e3;p=lyx.git

Merge branch 'master' of git.lyx.org:lyx
---

b917c4e40f9f5cd3d101444600eddafcca54d6e3