From: Juergen Spitzmueller <spitz@lyx.org>
Date: Mon, 8 Oct 2012 15:04:34 +0000 (+0200)
Subject: Merge branch 'master' of git.lyx.org:lyx
X-Git-Tag: 2.1.0beta1~1441
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=43583e3ba6f4a366a16e682e97caf57821888427;p=features.git

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

43583e3ba6f4a366a16e682e97caf57821888427