[LyX/2.3.x] Merge branch '2.3.x' of git.lyx.org:lyx into 2.3.x

[Uwe Stöhr]

commit d1ac023b505e4d0acfb92ba785f57d7ccd72f097
Merge: 9006045 db1c123
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Mon Feb 12 19:04:25 2018 +0100

    Merge branch '2.3.x' of git.lyx.org:lyx into 2.3.x

 lib/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)