]> code.delx.au - pulseaudio/commitdiff
Merge branch 'master' of git://gitorious.org/~flameeyes/pulseaudio/flameeyes-pulseaudio
authorDaniel Mack <daniel@caiaq.de>
Fri, 17 Jul 2009 12:20:57 +0000 (14:20 +0200)
committerDaniel Mack <daniel@caiaq.de>
Fri, 17 Jul 2009 12:20:57 +0000 (14:20 +0200)

Trivial merge