From: Juergen Spitzmueller <spitz@lyx.org>
Date: Tue, 25 Sep 2012 13:56:36 +0000 (+0200)
Subject: Merge branch 'master' of git.lyx.org:lyx
X-Git-Tag: 2.1.0beta1~1490
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=061924e2758fc43aed4b94ee2027026997343a51;p=features.git

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

061924e2758fc43aed4b94ee2027026997343a51