Merge branch 'ipset-6'

Conflicts:
	INSTALL
	mconfig
This commit is contained in:
Jan Engelhardt
2011-04-11 04:23:18 +02:00
80 changed files with 1446 additions and 1621 deletions

View File

@@ -21,7 +21,7 @@ build_gradm=m
build_iface=m
build_ipp2p=m
build_ipset4=m
build_ipset5=
build_ipset6=
build_ipv4options=m
build_length2=m
build_lscan=m