diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-24 14:15:15 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-24 14:15:15 +0200 |
commit | ca14951cd3caece93a0ad9d678c5dce8e26fd869 (patch) | |
tree | cf74808ffa692ff005820cc5d267784c13f2d6f2 /plugins/imklog | |
parent | c5178a4d21cf8ca3362b8a8394d0e762801550a4 (diff) | |
parent | 28516a1b745d1d078681a063b71637dd45306712 (diff) | |
download | rsyslog-ca14951cd3caece93a0ad9d678c5dce8e26fd869.tar.gz rsyslog-ca14951cd3caece93a0ad9d678c5dce8e26fd869.tar.xz rsyslog-ca14951cd3caece93a0ad9d678c5dce8e26fd869.zip |
Merge branch 'v3-stable' into beta
Conflicts:
doc/manual.html
Diffstat (limited to 'plugins/imklog')
0 files changed, 0 insertions, 0 deletions