]> git.lyx.org Git - features.git/commitdiff
Merge branch '2.1.x' of git.lyx.org:lyx into 2.1.x
authorUwe Stöhr <uwestoehr@lyx.org>
Mon, 9 Feb 2015 00:15:23 +0000 (01:15 +0100)
committerUwe Stöhr <uwestoehr@lyx.org>
Mon, 9 Feb 2015 00:15:23 +0000 (01:15 +0100)

Trivial merge