From: Juergen Spitzmueller <spitz@lyx.org>
Date: Tue, 18 Sep 2012 06:34:05 +0000 (+0200)
Subject: Merge branch '2.0.x' of git.lyx.org:lyx into 2.0.x
X-Git-Tag: 2.0.5~67^2~14
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=212af25fb26b8a5dc0e46ca111d03952d4a256a0;p=features.git

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

212af25fb26b8a5dc0e46ca111d03952d4a256a0