]> git.lyx.org Git - features.git/commitdiff
Merge branch 'master' of git.lyx.org:lyx
authorStephan Witt <switt@lyx.org>
Mon, 30 Jul 2012 12:34:12 +0000 (14:34 +0200)
committerStephan Witt <switt@lyx.org>
Mon, 30 Jul 2012 12:34:12 +0000 (14:34 +0200)

Trivial merge