![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Tue, 21 Nov 2006 17:14:36 +0000 (18:14 +0100) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Tue, 21 Nov 2006 17:14:36 +0000 (18:14 +0100) | ||
| commit | 27f7e9a53a309c23143691c37e50727a5f0e2386 | |
| tree | 6b2d3ac9a2a1d5853bcef6be86ca0e52f1658076 | tree | snapshot |
| parent | ddb911735889d9f2e087f079943f3b883f6251b9 | commit | diff |
| parent | a25ac81f5bd545fc52301596eb22cd45782958c9 | commit | diff |
Merge branch 'ff/dns'
Conflicts:
configure.in
contrib/collection.cgi
Conflicts:
configure.in
contrib/collection.cgi
| configure.in | diff1 | | diff2 | | blob | history |
| contrib/collection.cgi | diff1 | | diff2 | | blob | history |
| src/Makefile.am | diff1 | | diff2 | | blob | history |