Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
authorLennart Poettering <lennart@poettering.net>
Mon, 22 Jun 2009 20:36:31 +0000 (22:36 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 22 Jun 2009 20:36:31 +0000 (22:36 +0200)
1  2 
src/Makefile.am

diff --cc src/Makefile.am
Simple merge