git.lyx.org Git - lyx.git/commit

author	Jürgen Spitzmüller <jspitzm@linux-np7j.(none)>
	Sun, 29 Apr 2012 09:51:07 +0000 (11:51 +0200)
committer	Jürgen Spitzmüller <jspitzm@linux-np7j.(none)>
	Sun, 29 Apr 2012 09:51:07 +0000 (11:51 +0200)
commit	8995a8387a03361b6a7ff44b447a90a6187b1a14
tree	989a1a189e2cb9a14a7be14abfe80b6051af4a60	tree \| snapshot
parent	e85792a7201394b03cb00529c1f683a36ee0ea00	commit \| diff
parent	1f547493ec66a63adc967ab25f90b876948fdfbe	commit \| diff

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

Conflicts:
po/de.po

Signed-off-by: Jürgen Spitzmüller <jspitzm@linux-np7j.(none)>