Merge branch 'master' of git://git.debian.org/git/pkg-pulseaudio/pulseaudio-upstream
commitac032549cd7eba9459f1fcd8983f1d513913f14f
authorLennart Poettering <lennart@poettering.net>
Tue, 24 Jun 2008 00:16:49 +0000 (24 02:16 +0200)
committerLennart Poettering <lennart@poettering.net>
Tue, 24 Jun 2008 00:16:49 +0000 (24 02:16 +0200)
tree2cb9cd18a04cc879c078bcc11ed727830cde91b7
parent398514f577d2f0cb801320b3466a4c4e25b6586e
parent1562671b9b3048759b210a329764fac8880b62dd
Merge branch 'master' of git://git.debian.org/git/pkg-pulseaudio/pulseaudio-upstream