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

[Kornel Benko]

commit 63eaf11493dac69ff2be02c21441212484096a5d
Merge: 5f7102d dd73982
Author: Kornel Benko <kor...@lyx.org>
Date:   Mon Nov 18 15:45:22 2013 +0100

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