Merge remote branch 'phish3/master'
authorLennart Poettering <lennart@poettering.net>
Wed, 7 Oct 2009 01:43:24 +0000 (03:43 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 7 Oct 2009 01:43:24 +0000 (03:43 +0200)
1  2 
configure.ac
src/Makefile.am

diff --cc configure.ac
Simple merge
diff --cc src/Makefile.am
Simple merge