[LyX/2.0.x] Merge branch '2.0.x' of git.lyx.org:lyx into 2.0.x

[Uwe Stöhr]

commit 2831c728f39f092db1c3b683b12714fa0446595a
Merge: a71090c 00a7f00
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Thu Jan 30 01:13:03 2014 +0100

    Merge branch '2.0.x' of git.lyx.org:lyx into 2.0.x