Merge branch 'ff/dns'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 21 Nov 2006 17:14:36 +0000 (18:14 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 21 Nov 2006 17:14:36 +0000 (18:14 +0100)
commit27f7e9a53a309c23143691c37e50727a5f0e2386
tree6b2d3ac9a2a1d5853bcef6be86ca0e52f1658076
parentddb911735889d9f2e087f079943f3b883f6251b9
parenta25ac81f5bd545fc52301596eb22cd45782958c9
Merge branch 'ff/dns'

Conflicts:

configure.in
contrib/collection.cgi
configure.in
contrib/collection.cgi
src/Makefile.am