Merge branches 'ff/dns' and 'sh/email' into next
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 2 Dec 2006 18:17:50 +0000 (19:17 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 2 Dec 2006 18:17:50 +0000 (19:17 +0100)
commit845b2d2577461a4bc2bf4385cb521b4ad575651d
treede8f6c8ef3a46cced50613050d74d3b45bca2935
parent0b5b7d3f65c22163a1bf1a9f2ba55e3965e47151
parentc4377c1e3d97ae0641bf740dc90a59633b319fd1
parent578f62451f20db8771ada96759918b53a5a025c4
Merge branches 'ff/dns' and 'sh/email' into next

Conflicts:

configure.in
src/Makefile.am
configure.in
src/Makefile.am