Merge branch 'master' of git://0pointer.de/pulseaudio
authorDaniel Mack <daniel@caiaq.de>
Sun, 6 Dec 2009 14:53:36 +0000 (15:53 +0100)
committerDaniel Mack <daniel@caiaq.de>
Sun, 6 Dec 2009 14:53:36 +0000 (15:53 +0100)
commitf9b03d3a44e905d50dfac1483dbf1818d2b84ffa
treef94902497876669b4238798f160dae765a430c58
parent1b2cbe92dbffc1d8be12c64fdc647e3cb5e5c58c
parente8a5746f2fcae59bfd18d39b621509b3ef130453
Merge branch 'master' of git://0pointer.de/pulseaudio