From: Uwe Stöhr <uwestoehr@lyx.org>
Date: Fri, 22 May 2015 20:03:13 +0000 (+0200)
Subject: Merge branch 'master' of git.lyx.org:lyx
X-Git-Tag: 2.2.0alpha1~686
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=0f3fc879d0b47c6715b584c542d9f7f5291f70a8;p=features.git

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

0f3fc879d0b47c6715b584c542d9f7f5291f70a8