code.delx.au - pulseaudio/commit

]> code.delx.au - pulseaudio/commit

author	Lennart Poettering <lennart@poettering.net>
	Tue, 7 Oct 2008 19:38:06 +0000 (21:38 +0200)
committer	Lennart Poettering <lennart@poettering.net>
	Tue, 7 Oct 2008 19:38:06 +0000 (21:38 +0200)
commit	5925d44013e2d559d1755176af0e26f69fc46458
tree	2724bf186d3a19008990c924b3c68ce976e92dcc	tree
parent	3d7b76d159765a78e6e7288bd7aa5c276aa24e87	commit \| diff
parent	8c2a7c8707a556e4891383bc1786958304828dd9	commit \| diff

Merge commit 'origin/master-tx' into master-tx

Conflicts:
po/de.po