summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-04-15 11:03:07 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-04-15 11:03:07 +0200
commitb7fec51ba7b1042313b51dc27102fa0a9cebafb5 (patch)
treeebe76258f2aecbe771ea8fe2dab633f8e7e278f9 /plugins
parentbcd2661167998b7a986f31e5f6f3b691ab0a662a (diff)
parentf4b26f77ab03a1bacf2c49a1982fabe2a58ccb9d (diff)
downloadrsyslog-b7fec51ba7b1042313b51dc27102fa0a9cebafb5.tar.gz
rsyslog-b7fec51ba7b1042313b51dc27102fa0a9cebafb5.tar.xz
rsyslog-b7fec51ba7b1042313b51dc27102fa0a9cebafb5.zip
Merge branch 'v3-stable' into beta
Conflicts: ChangeLog doc/manual.html
Diffstat (limited to 'plugins')
0 files changed, 0 insertions, 0 deletions