Merge branch 'master' of git://0pointer.de/pulseaudio
authorTanu Kaskinen <tanuk@iki.fi>
Tue, 13 Oct 2009 15:42:47 +0000 (18:42 +0300)
committerTanu Kaskinen <tanuk@iki.fi>
Tue, 13 Oct 2009 15:42:47 +0000 (18:42 +0300)
commite064d270049ba9e6e4e82649eff245470a75c939
tree165c677251472c4c8a5d56d583db0017df35696e
parentce033e7f3a0b6073f8f1423deb656656cfe94bbb
parentc9375aa5e936cf896946f1f7bd80cce9cfe5d9a1
Merge branch 'master' of git://0pointer.de/pulseaudio