commit dbadd00733b659f9ab28fb578b210faf6b85eed9
Merge: e44612f 414dd44
Author: Uwe Stöhr
Date: Thu Jun 4 01:16:29 2015 +0200
Merge branch '2.1.x' of git.lyx.org:lyx into 2.1.x
commit 2c3f673c32b2a50734b8427bcbbe4fd205dc3717
Merge: 13edb2e 8c5bdcb
Author: Uwe Stöhr
Date: Mon Feb 9 01:15:23 2015 +0100
Merge branch '2.1.x' of git.lyx.org:lyx into 2.1.x
commit 69c1a6b04c64b4b70e6e1200eb8f859d9982856b
Merge: 7749f72 a0ed470
Author: Kornel Benko
Date: Fri Aug 15 17:08:40 2014 +0200
Merge branch '2.1.x' of git.lyx.org:lyx into 2.1.x
commit f5fb48cdb5038a6fbb8e976f7a5829fa09f1c262
Merge: e7e5bfc b73a599
Author: Uwe Stöhr
Date: Mon Apr 28 22:27:19 2014 +0200
Merge branch '2.1.x' of git.lyx.org:lyx into 2.1.x
