summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-03-04 16:35:43 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2011-03-04 16:35:43 +0100
commiteeb3212dad4d72eedad04a37b28b38fc831f67ed (patch)
tree21664ffa0c5d788cc9d3ab535e953963bd410d63 /plugins
parentb8610a107ee4fd9e4b1ba06e7bd43dd6cbd72ea7 (diff)
parent5709b056c5be16df1f1a2369a737e40711f20979 (diff)
downloadrsyslog-eeb3212dad4d72eedad04a37b28b38fc831f67ed.tar.gz
rsyslog-eeb3212dad4d72eedad04a37b28b38fc831f67ed.tar.xz
rsyslog-eeb3212dad4d72eedad04a37b28b38fc831f67ed.zip
Merge branch 'v5-stable' into v5-beta
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'plugins')
0 files changed, 0 insertions, 0 deletions