diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-16 12:21:10 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-16 12:21:10 +0100 |
commit | 75bfef7fa1c9f71232a282aa66e52b2d1860100a (patch) | |
tree | 9cc622a55341f7fc7b0185965db2354704df0407 /plugins | |
parent | d2dc913edc7bc4e0880f4dd6eb4aff495adb8138 (diff) | |
parent | ec6230cffe6e06957113d53272d00dc859a3e617 (diff) | |
download | rsyslog-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