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

[Uwe Stöhr]

commit f6fde9dbb243b4ddb7a0e73feaf86b632a23e164
Merge: f6029f7 d3eae5b
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Thu Apr 30 01:23:03 2015 +0200

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