Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
authorLennart Poettering <lennart@poettering.net>
Thu, 5 Mar 2009 03:34:56 +0000 (04:34 +0100)
committerLennart Poettering <lennart@poettering.net>
Thu, 5 Mar 2009 03:34:56 +0000 (04:34 +0100)
1  2 
src/Makefile.am

diff --cc src/Makefile.am
Simple merge