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

[Uwe Stöhr]

commit 4f716cb0f8f350a1481dbdee12dbd558e0180a9b
Merge: ea05826 a6f4aa2
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Sun Mar 9 18:20:55 2014 +0100

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