From: Uwe Stöhr <uwestoehr@lyx.org>
Date: Wed, 29 Apr 2015 23:23:03 +0000 (+0200)
Subject: Merge branch 'master' of git.lyx.org:lyx
X-Git-Tag: 2.2.0alpha1~939
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f6fde9dbb243b4ddb7a0e73feaf86b632a23e164;p=features.git

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

f6fde9dbb243b4ddb7a0e73feaf86b632a23e164