[syslog-ng/f17] (3 commits) ...Resolve the file conflict with rsyslog (#811058).

[Jose Pedro Oliveira]

Summary of changes:

  94e5d18... Rebuild against PCRE 8.30 (*)
  b706e11... libnet rebuild. (*)
  bc24a76... Resolve the file conflict with rsyslog (#811058). (*)

(*) This commit already existed in another branch; no separate mail sent