From: Uwe Stöhr <uwestoehr@lyx.org>
Date: Thu, 15 Mar 2012 01:22:15 +0000 (+0100)
Subject: Merge branch '2.0.x' of git.lyx.org:lyx into 2.0.x
X-Git-Tag: 2.0.4~176
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=0e271180f91603a8547b652dd3da1e8f4deb8375;p=features.git

Merge branch '2.0.x' of git.lyx.org:lyx into 2.0.x
---

0e271180f91603a8547b652dd3da1e8f4deb8375