Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
authorLennart Poettering <lennart@poettering.net>
Thu, 23 Jul 2009 13:18:06 +0000 (15:18 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 23 Jul 2009 13:18:06 +0000 (15:18 +0200)
commit88d5749f6ae8d391963a12a6221f006de2947e50
treef1de05b054b1ee8b272804a03b621a1dde1d8416
parent0225ef68f2876bebd14977882db313fd7f3f6d64
parent3d6278bc31aa7053f1228b3d874ba36f50a8c2d5
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio

Conflicts:
src/daemon/main.c
src/daemon/main.c