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

author Uwe Stöhr <uwestoehr@lyx.org>

Sun, 30 Sep 2012 23:43:06 +0000 (01:43 +0200)

committer Uwe Stöhr <uwestoehr@lyx.org>

Sun, 30 Sep 2012 23:43:06 +0000 (01:43 +0200)
author Uwe Stöhr <uwestoehr@lyx.org>
Sun, 30 Sep 2012 23:43:06 +0000 (01:43 +0200)
committer Uwe Stöhr <uwestoehr@lyx.org>
Sun, 30 Sep 2012 23:43:06 +0000 (01:43 +0200)
diff --cc lib/doc/UserGuide.lyx
Simple merge
diff --cc lib/doc/fr/UserGuide.lyx
Simple merge
diff --cc lib/doc/ja/UserGuide.lyx
Simple merge
author	Uwe Stöhr <uwestoehr@lyx.org>
	Sun, 30 Sep 2012 23:43:06 +0000 (01:43 +0200)
committer	Uwe Stöhr <uwestoehr@lyx.org>
	Sun, 30 Sep 2012 23:43:06 +0000 (01:43 +0200)
		1	2
lib/doc/UserGuide.lyx	patch \|	diff1 \|	diff2 \|	blob \| history
lib/doc/fr/UserGuide.lyx	patch \|	diff1 \|	diff2 \|	blob \| history
lib/doc/ja/UserGuide.lyx	patch \|	diff1 \|	diff2 \|	blob \| history