Resolve revert conflicts

This commit is contained in:
Tom Eastep 2009-07-06 18:08:17 -07:00
parent 36a42fbe7f
commit bab4f9df33

View File

@ -130,10 +130,7 @@ None.
N E W F E A T U R E S I N 4 . 4 . 0 Beta 4
----------------------------------------------------------------------------
1) The DISABLE_IPV6 option has been removed. If DISABLE_IPV6=Yes is
given in shorewall.conf, a warning will be issued.
2) Paul Gear has contributed the following macros:
1) Paul Gear has contributed the following macros:
macro.Webcache (originally named macro.DG)
macro.IPPbrd