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

[Kornel Benko]

commit 34207e5571e38ced82f1b0fce7099ebe29147a7b
Merge: d3245d4 f5cf21d
Author: Kornel Benko <kor...@lyx.org>
Date:   Sun Aug 4 16:02:01 2013 +0200

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