summaryrefslogtreecommitdiffstats
path: root/plugins/imklog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-08-05 11:37:38 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2010-08-05 11:37:38 +0200
commit9b3ed8408785d52d3b84d979ae1e5fa7ae3ce87f (patch)
tree49b4f482a002911e8839f393e03c8aec482920b3 /plugins/imklog
parentd51aefc052377a2cee103a4d87c7c8dcf8c74081 (diff)
parent33a2855c69bf1a86ca658fcbcee8eea6b6e23221 (diff)
downloadrsyslog-9b3ed8408785d52d3b84d979ae1e5fa7ae3ce87f.tar.gz
rsyslog-9b3ed8408785d52d3b84d979ae1e5fa7ae3ce87f.tar.xz
rsyslog-9b3ed8408785d52d3b84d979ae1e5fa7ae3ce87f.zip
Merge branch 'v3-stable' into v4-stable
Conflicts: ChangeLog configure.ac doc/manual.html doc/professional_support.html
Diffstat (limited to 'plugins/imklog')
0 files changed, 0 insertions, 0 deletions