Jan Engelhardt (1):
      update .gitignore

Pablo Neira Ayuso (7):
      conntrackd: simplify TCP connection handling logic
      conntrackd: fix compilation in src/parse.c
      doc: fix documentation on ExpectationSync and H.323 helper
      conntrackd: add bugtrap notice in case of flush while commit in progress
      conntrackd: fix commit operation, needs to be synchronous
      conntrackd: implement selective flushing for `-t' and `-F' commands
      bump version to 1.2.2