Florian Westphal (1): doc: rpfilter: invert option should have own paragraph Jan Engelhardt (11): build: resolve link failure for ip6t_NETMAP doc: fixup omissions in ip6tables-restore.8 doc: document iptables-restore's -t option doc: document iptables-restore's -v option doc: document iptables-restore's -M option doc: document iptables-restore's -h option doc: name the supported log levels for ipt_LOG doc: mention -m in the manpage doc: document the -4 and -6 options extensions: S/DNPT: add missing save function build: bump SONAME for libxtables Jozsef Kadlecsik (3): Introduce match/target aliases Add the "state" alias to the "conntrack" match Merge branch 'master' of vishnu.netfilter.org:/data/git/iptables Pablo Neira Ayuso (7): iptables: remove unused leftover definitions libxtables: add xtables_rule_matches_free libxtables: add xtables_print_num Merge branch 'stable' into 'master' doc: document nat table for IPv6 doc: iptables provides up to 5 independent tables build: bump version to 1.4.18 Ulrich Weber (3): extensions: libip6t_DNPT: fix wording in DNPT target extension: libip6t_DNAT: allow port DNAT without address extensions: libip6t_DNAT: set IPv6 DNAT --to-destination