Merge branch 'master' of git.lyx.org:lyx

This commit is contained in:
Kornel Benko 2015-12-31 15:24:33 +01:00
commit 42f1f58418