Mohit Mehta (4):
      conntrackd: `-i -x' does not display internal cache in XML
      conntrackd: update error message for max netlink socket size reached
      conntrackd: enforce strict logic for NetlinkBufferSize[*] clauses
      conntrackd: replace cryptic `mfrm' by `malformed' in `-s'

Pablo Neira Ayuso (34):
      conntrackd: fix UDP filtering in configuration file
      conntrackd: add support for TCP window scale factor synchronization
      conntrackd: cleanup port addition in the message building path
      conntrackd: fix `conntrackd -c' if external cache is disabled
      conntrack: option `-t' in on the same line as `-m' in manpage
      conntrackd: PollSecs goes in the General clause for statistics
      conntrackd: split __run() routine for poll and event-driven modes
      doc: description on how to block traffic with conntrack was incomplete
      conntrack: fix `-L --src-nat --dst-nat'
      conntrack: revert fix `-L --src-nat --dst-nat'
      conntrack: fix `conntrack -L --src-nat --dst-nat' (second try)
      conntrack: `-L --src-nat --dst-nat' filter using AND, not OR logic
      conntrackd: complete TCP window scale support
      conntrack: expand array that maps option-flags to option-names
      conntrack: put all the commands and options code together
      conntrack: fix port filter with `--src-nat' and `--dst-nat'
      conntrack: add `--any-nat' to filter any NATted flow
      conntrack: add testsuite for NAT filtering options
      conntrack: re-fix inconsistent display with `--src-nat' and `--dst-nat'
      conntrack: fix bogus NATted flows in filtering
      conntrack: fix `conntrack --src-nat 3.3.3.3' and similar
      conntrack: fix `conntrack --src-nat 1.1.1.1' if PAT applied
      conntrack: fix `conntrack --any-nat 1.1.1.1' filtering
      conntrack: --[src|dst|any]-nat requires IP:PORT as argument
      conntrack: fix `conntrack --[src|dst|any]-nat IP:PORT' if port mismatches
      conntrack: cleanup parsing of the NAT arguments
      conntrackd: fix ICMPv6 support
      conntrack: add zone support
      conntrackd: open event handler once cache has been populated
      conntrackd: setup event reliability after handler creation
      conntrackd: fix parsing of NAT sequence adjustment in synchronization messages
      conntrackd: warn on TCPWindowTracking option (it requires kernel >= 2.6.35)
      build: update libnetfilter_conntrack dependency (>= 0.0.102)
      build: bump version to 0.9.15