Merge branch 'master' of git://git.0pointer.de/pulseaudio
authorColin Guthrie <pulse@colin.guthr.ie>
Sun, 3 Aug 2008 18:56:49 +0000 (19:56 +0100)
committerColin Guthrie <pulse@colin.guthr.ie>
Sun, 3 Aug 2008 18:56:49 +0000 (19:56 +0100)
commit5744237a066186be305be9ea3ecb3ccccadcceca
tree6a08957a66fb308a8f1b37232d9b2d24a246e394
parentb30a5d601eaffd98914ca0b9fdecd863eade0b4f
parent04ffac57a67eee9640f248b6fab33ee8367b0eab
Merge branch 'master' of git://git.0pointer.de/pulseaudio