summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-12-16 12:21:10 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-12-16 12:21:10 +0100
commit75bfef7fa1c9f71232a282aa66e52b2d1860100a (patch)
tree9cc622a55341f7fc7b0185965db2354704df0407 /plugins
parentd2dc913edc7bc4e0880f4dd6eb4aff495adb8138 (diff)
parentec6230cffe6e06957113d53272d00dc859a3e617 (diff)
downloadrsyslog-75bfef7fa1c9f71232a282aa66e52b2d1860100a.tar.gz
rsyslog-75bfef7fa1c9f71232a282aa66e52b2d1860100a.tar.xz
rsyslog-75bfef7fa1c9f71232a282aa66e52b2d1860100a.zip
Merge branch 'v3-stable' into v4-stable
Conflicts: ChangeLog
Diffstat (limited to 'plugins')
0 files changed, 0 insertions, 0 deletions