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)
Conflicts:
src/daemon/main.c

1  2 
src/daemon/main.c

Simple merge