]> git.lyx.org Git - features.git/commitdiff
Merge branch '2.0.x' of git.lyx.org:lyx into 2.0.x
authorUwe Stöhr <uwestoehr@lyx.org>
Sat, 30 Jun 2012 23:42:54 +0000 (01:42 +0200)
committerUwe Stöhr <uwestoehr@lyx.org>
Sat, 30 Jun 2012 23:42:54 +0000 (01:42 +0200)

Trivial merge