Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
authorLennart Poettering <lennart@poettering.net>
Wed, 22 Jul 2009 20:49:06 +0000 (22:49 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 22 Jul 2009 20:49:06 +0000 (22:49 +0200)
1  2 
src/daemon/main.c

Simple merge