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