]> git.lyx.org Git - lyx.git/commitdiff
Merge branch 'master' of git.lyx.org:lyx
authorUwe Stöhr <uwestoehr@lyx.org>
Fri, 22 May 2015 20:03:13 +0000 (22:03 +0200)
committerUwe Stöhr <uwestoehr@lyx.org>
Fri, 22 May 2015 20:03:13 +0000 (22:03 +0200)

Trivial merge