Florian Westphal (4): conntrack: add support for mark mask conntrack: skip sending update message to kernel if conntrack is unchanged testsuite: add tests for --mark option conntrack: add missing break when parsing --id/--secmark options Jan Engelhardt (3): Update .gitignore build: use AC_CONFIG_AUX_DIR and stash away tools build: disable implicit .tar.gz archive generation and use POSIX mode Pablo Neira Ayuso (8): build: Linux kernel-style for compilation messages conntrack: remove unused variable with -S conntrackd: add missing initial caching of gettimeofday() conntrackd: fix filtering of dump output if internal cache is disabled Merge branch 'master' of git://dev.medozas.de/conntrack-tools doc: primary-backup.sh: clarify licensing terms (GPLv2+) conntrackd: fix checking of return value of queue_add() build: bump version to 1.0.1