Andreas Schwab (1): libxt_tcp: print space before, not after "flags:" Jan Engelhardt (23): iptables-restore: warn about -t in rule lines doc: grammatical updates to libxt_SET libxt_u32: do bounds checking for @'s operands libxt_devgroup: consolidate devgroup specification parsing libxt_devgroup: guard against negative numbers libxt_LED: guard against negative numbers libxt_*limit: avoid division by zero Merge remote-tracking branch 'nf/stable' build: support for automake-1.12 build: separate AC variable replacements from xtables.h build: have `make clean` remove dep files too libxtables: consolidate preference logic iptables: support for target aliases libxt_NOTRACK: replace as an alias to CT --notrack iptables: support for match aliases libxt_state: replace as an alias to xt_conntrack Merge branch 'master' of git://git.inai.de/iptables doc: clean up interpunction in state list for xt_conntrack doc: deduplicate extension descriptions into a new manpage doc: trim "state" manpage and reference conntrack instead doc: have NOTRACK manpage point to CT instead doc: mention iptables-apply in the SEE ALSO sections Merge branch 'master' of git://git.inai.de/iptables Jozsef Kadlecsik (1): New set match revision with --return-nomatch flag support Michal Kubeček (1): libip6t_frag: match any frag id by default Pablo Neira Ayuso (6): include: add missing linux/netfilter_ipv4/ip_queue.h ip[6]tables-restore: cleanup to reduce one level of indentation include: add missing linux/netfilter_ipv4/ip_queue.h iptables: fix wrong error messages extensions: libxt_addrtype: fix type in help message bump version to 1.4.16