commit b917c4e40f9f5cd3d101444600eddafcca54d6e3 Merge: e7aaaed 82e0ad3 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Sun May 29 23:58:10 2016 +0200
Merge branch 'master' of git.lyx.org:lyx
commit b917c4e40f9f5cd3d101444600eddafcca54d6e3 Merge: e7aaaed 82e0ad3 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Sun May 29 23:58:10 2016 +0200
Merge branch 'master' of git.lyx.org:lyx