Merge branch '5.0.13'

This commit is contained in:
Tom Eastep 2016-10-17 10:16:30 -07:00
commit 9796af5d80
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10

View File

@ -3967,7 +3967,7 @@ sub process_mangle_inline( $$$$$$$$$$$$$$$$$$$ ) {
process_mangle_rule1( $chainref, process_mangle_rule1( $chainref,
$moriginalmark, $moriginalmark,
$msource, $msource,
$dest, $mdest,
$proto, $proto,
merge_macro_column( $mports, $ports ), merge_macro_column( $mports, $ports ),
merge_macro_column( $msports, $sports ), merge_macro_column( $msports, $sports ),