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

[Uwe Stöhr]

commit 5e6f9d17532407589f35931da9900758e8543231
Merge: 2da9909 0dceac6
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Tue Jul 26 23:40:34 2016 +0200

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

 src/RowPainter.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)