From: Uwe Stöhr Date: Sun, 1 Jul 2012 14:15:55 +0000 (+0200) Subject: Merge branch 'master' of git.lyx.org:lyx X-Git-Tag: 2.1.0beta1~1689 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=00833efd10ab44385813a2a48cc8590ab1ca030d;p=features.git Merge branch 'master' of git.lyx.org:lyx --- 00833efd10ab44385813a2a48cc8590ab1ca030d