From: Kornel Benko <kornel@lyx.org>
Date: Sat, 18 Aug 2012 11:58:11 +0000 (+0200)
Subject: Merge branch 'master' of git.lyx.org:lyx
X-Git-Tag: 2.1.0beta1~1595^2
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=8570e14501f2a8993ed431270c7841cc8d43277c;hp=-c;p=features.git

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

8570e14501f2a8993ed431270c7841cc8d43277c