Christophe Fish (1):
      IP2BIN: fix missing protocol key

Eric Leblond (12):
      nflog: adjust unit which was inaccurate.
      ifindex: avoid memory allocation
      ip2str: suppress explicit allocation of some output key values
      ip2bin: suppress explicit allocation of some output key values
      hwhdr: suppress explicit allocation
      ip2bin: add AF_BRIDGE family support.
      db plugins: free memory at exit.
      ulogd: include config.h in all files.
      ulogd: permit compilation of plugin outside of tree
      DB plugin: add capability to specify complete INSERT command
      Documentation: information about procedure variable.
      Revert "ulogd: permit compilation of plugin outside of tree"

Pablo Neira Ayuso (24):
      NFCT: fix NULL dereference when hashtable is full
      NFCT: improve netlink overrun handling
      NFCT: add configurable option to set the value of the resynchronization timer
      NFCT: avoid spamming report about netlink overruns
      build: remove -lpthread from Makefile
      IPFIX: preliminary fixes, yet unusable
      NFCT: cleanup constructor and destructor functions
      NFCT: change `pollinterval' behaviour
      NFCT: use new hashtable implementation for better performance
      NFCT: split event handler if hashtable is used or not
      NFCT: fix number of options (missing one)
      NFCT: fix reset counters via SIGUSR2 signal
      src: use ARRAY_SIZE to calculate the array size of keys
      LOGEMU: fix crash if output file cannot be accessed
      fix incorrect negative EINTR checking in main loop
      output: add new plugin XML to output logs in XML
      output: XML: support reopening file via SIGHUP
      output: XML: add infix in output file
      NFCT: fix plugin re-use in different stacks
      fix wrong list addition in plugin re-use logic
      NFCT: copy the conntrack object to the plugin once
      IPFIX: remove plugin until it is usable
      build: bump version to 2.0.0beta4 and update dependencies
      build: remove obsolete reference to debian/ dir in Makefile

Pierre Chifflier (3):
      ulogd: configure all plugins before resolving keys.
      Remove debian directory
      Fix wrong definition of views in flat DB schema

Romain Bignon (1):
      DB plugins: fixed bug with INSERT* procedures