Eric Leblond (6):
      NFCT: fix crash in polling mode if used by two stacks
      nfacct: add variable to not zero counter after read
      pgsql schema: add nfacct table
      pgsql schema: fix timestamp default value
      pgsql: only disable key if it starts with underscore
      nfacct: add timestamp option

Michael Tremer (1):
      sqlite3: Add more logging if database initialization fails.

Pablo Neira Ayuso (9):
      src: add ULOGD_DTYPE_SUM for nfacct-based accounting
      output: XML: support for NFACCT input plugin
      output: XML: display time for NFACCT
      input: NFCT: fix compilation warning with gcc-4.7
      src: fix version that -V displays
      ulogd.conf: slightly expand documentation on zerocounter option for nfacct
      filter: IP2HBIN: fix compilation warning with gcc-4.7
      src: update copyright and authors information
      bump version to 2.0.1

Thomas Jarosch (1):
      ipfix: fix bracket imbalance if IPPROTO_SCTP is defined