From: Uwe Stöhr <uwestoehr@lyx.org>
Date: Thu, 30 May 2013 16:15:57 +0000 (+0200)
Subject: Merge branch 'master' of git.lyx.org:lyx
X-Git-Tag: 2.1.0beta1~120
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=6baa65119b22e88186ecc5291445e1f2f595d906;p=features.git

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

6baa65119b22e88186ecc5291445e1f2f595d906