Merge branch 'master' of git://git.0pointer.de/pulseaudio
authorColin Guthrie <pulse@colin.guthr.ie>
Wed, 30 Jul 2008 22:43:45 +0000 (23:43 +0100)
committerColin Guthrie <pulse@colin.guthr.ie>
Wed, 30 Jul 2008 22:43:45 +0000 (23:43 +0100)
commitb30a5d601eaffd98914ca0b9fdecd863eade0b4f
tree2bf5dfaa46b8e1733311562dba299709a0a3228e
parent0e1936fd56ad51509424f3eca06fe3a442b4dc9c
parent0b428e7cb1efdd7330b89a9855f08c45bfa98307
Merge branch 'master' of git://git.0pointer.de/pulseaudio