Merge branch 'master' of git://0pointer.de/pulseaudio
commited7642ebac32bde8d9c47f3a1d8eabf75c3ea986
authorDaniel Mack <daniel@caiaq.de>
Wed, 11 Nov 2009 09:48:39 +0000 (11 10:48 +0100)
committerDaniel Mack <daniel@caiaq.de>
Wed, 11 Nov 2009 09:48:39 +0000 (11 10:48 +0100)
tree9db77a271430da8abf7b6d11079bc660f7428094
parent21ffcd55a5a425870f8f4c3b4933bc7cb352e339
parent22946427624afde1d53973fa5a2e9e2041ffc5b7
Merge branch 'master' of git://0pointer.de/pulseaudio