From: Uwe Stöhr <uwestoehr@lyx.org>
Date: Mon, 2 Jul 2012 22:40:23 +0000 (+0200)
Subject: Merge branch 'master' of git.lyx.org:lyx
X-Git-Tag: 2.1.0beta1~1683
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=3e250d2ce6c83e60621ae6b6e6325af6145bcc9c;p=features.git

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

3e250d2ce6c83e60621ae6b6e6325af6145bcc9c