Adrian Bridgett (1):
      src: manpage and help display improvements

Florian Westphal (1):
      conntrack: flush stdout for each expectation event, too

Pablo Neira Ayuso (34):
      conntrackd: generalize caching infrastructure
      conntrackd: generalize external handlers to prepare expectation support
      conntrackd: generalize/cleanup network message building/parsing
      conntrackd: generalize local handler actions
      conntrackd: simplify cache_get_extra function
      conntrackd: remove cache_data_get_object and replace by direct pointer
      conntrackd: constify ct parameter of ct_filter_* functions
      conntrackd: relax checkings in ct_filter_sanity_check
      conntrackd: minor cleanup for commit
      conntrackd: support for expectation synchronization
      doc: update conntrack-tools manual to detail expectation support
      conntrackd: fix expectation filtering if ExpectationSync On is used
      conntrack: add expectation support for `-o' option
      conntrackd: support `-i exp -x' and `-e exp -x' options
      conntrack: fix setting fixed-timeout status flag
      conntrackd: add support expectation class synchronization
      conntrackd: add NAT expectation support
      conntrackd: add support to synchronize helper name
      conntrackd: support expectfn synchronization for expectations
      conntrackd: fix parsing of expectation class, helper name and NAT
      conntrack: allow to filter by mark from kernel-space
      conntrackd: allow using lower/upper case in ExpectationSync
      doc: add ras, q.931 and h.245 to examples configuration file
      doc: fix example on how to filter events via iptables CT target
      icmp[v6]: --icmp[v6]-[type|code] are optional for updates and deletes
      src: integrate nfct into the conntrack-tools tree
      tests: add nfct tests for cttimeout
      build: bump version to 1.2.0
      nfct: fix compilation warning in cttimeout support
      build: update dependencies with libnetfilter_conntrack (>= 1.0.1)
      move qa directory to tests/conntrack/
      tests: conntrack: add run-test.sh script
      add nfct(8) manpage
      add README.nfct