Copy head@r302406 to stable/11 as part of the 11.0-RELEASE cycle.Prune svn:mergeinfo from the new branch, as nothing has been mergedhere.Additional commits post-branch will follow.Approved by: re (implicit)Sponsored by: The FreeBSD Foundation
Revert r288682I meant to do this on ^/user/ngie/more-testsPointyhat to: ngie (use svn info next time...)
Merge IPFilter 4.1.23 back to HEADSee src/contrib/ipfilter/HISTORY for details of changes since 4.1.13
Resolve conflicts (and believe me...you don't want to know).
* Someone imported a lot of files with the wrong CVS tag, so lots of files need that fixed in them....* Keep unnecessary files out of the non-vendor part of this CVS repository.
This commit was generated by cvs2svn to compensate for changes in r145510,which included commits to RCS files with non-trunk default branches.
import ipfilter 4.1.8 into the vendor branch