Eric Dumazet (1):
      xt_socket: add --nowildcard flag

Florian Westphal (3):
      extensions: libxt_socket: update man page
      doc: add libnetfilter_queue pointer to libxt_NFQUEUE.man
      doc: merge ip6table man pages into ipv4 ones

Jozsef Kadlecsik (1):
      extensions: libxt_set, libxt_SET: check the set family too

Kevin Cernekee (1):
      ip6tables: Use consistent exit code for EAGAIN

Laurence J. Lane (8):
      iptables: libxt_hashlimit.man: correct address
      iptables: libxt_conntrack.man extraneous commas
      iptables: libip(6)t_REJECT.man default icmp types
      iptables: iptables-xm1.1 correct man section
      iptables: libxt_recent.{c,man} dead URL
      iptables: libxt_string.man add examples
      extensions: libxt_LOG: use generic syslog reference in manpage
      iptables: extensions/GNUMakefile.in use CPPFLAGS

Lutz Jaenicke (1):
      iptables: correctly reference generated file

Pablo Neira Ayuso (7):
      Merge branch 'stable-1.4.20'
      Merge branch 'stable-1.4.20'
      ip[6]tables: fix incorrect alignment in commands_v_options
      build: add software version to manpage first line at configure stage
      extensions: libxt_cluster: add note on arptables-jf
      utils: nfsynproxy: fix error while compiling the BPF filter
      iptables 1.4.21 release

Patrick McHardy (2):
      extensions: add SYNPROXY extension
      utils: add nfsynproxy tool

Phil Oester (4):
      iptables: state match incompatibilty across versions
      libxtables: xtables_ipmask_to_numeric incorrect with non-CIDR masks
      iptables: improve chain name validation
      iptables: spurious error in load_extension

stephen hemminger (1):
      xtables: trivial spelling fix