[LyX/master] Merge branch 'master' of git.lyx.org:lyx

[Juergen Spitzmueller]

commit 57b69a5efddf9f3c148007322f00dad6c253a2ed
Merge: ecc90a9 3c6f242
Author: Juergen Spitzmueller <sp...@lyx.org>
Date:   Sun Jun 26 14:27:30 2016 +0200

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

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