Merge branch 'master' into with-dns-bl
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 5 Oct 2008 13:22:54 +0000 (15:22 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 5 Oct 2008 13:22:54 +0000 (15:22 +0200)
Conflicts:

postlicyd/iplist.c
postlicyd/tst-rbl.c

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

No differences found