]> git.lyx.org Git - features.git/commitdiff
Merge branch '2.2.x' of git.lyx.org:lyx into 2.2.x
authorUwe Stöhr <uwestoehr@lyx.org>
Fri, 21 Oct 2016 23:00:23 +0000 (01:00 +0200)
committerUwe Stöhr <uwestoehr@lyx.org>
Fri, 21 Oct 2016 23:00:23 +0000 (01:00 +0200)

Trivial merge