Eric Leblond (13):
      nacct: fix format warning
      util: fix warning on format string
      db: set ring default size to 0
      db: cancel injection thread when terminating
      db: don't loose one packet on reconnect
      store Common Information Model name in ulogd key
      json: introduce new JSON output plugin
      ulogd: avoid potential double print of message
      ulogd: add carriage return as separator
      nfct: use start timestamp if provided
      json: use packet timestamp if available
      printpkt: oob.time.sec was not used
      Set release number to 2.0.4.

Gustavo Zacarias (1):
      ulogd: use AC_SEARCH_LIBS for libpthread

Ken-ichirou MATSUZAWA (1):
      ulogd: fix loglevel handling