summaryrefslogtreecommitdiffstats
path: root/sample.conf
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-05-29 13:52:55 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-05-29 13:52:55 +0200
commit2ed8e41b31b4c7e20da487a0a8abc51cbabf70a6 (patch)
treeac069b67131b3e1f470cb983a32d0b2f54ca70bd /sample.conf
parent8d8befaeca0d9ed3f096780e499a3231f16585c4 (diff)
parent43c45bfebcc672d6fbec2d4d659609d1ea48eda6 (diff)
downloadrsyslog-2ed8e41b31b4c7e20da487a0a8abc51cbabf70a6.tar.gz
rsyslog-2ed8e41b31b4c7e20da487a0a8abc51cbabf70a6.tar.xz
rsyslog-2ed8e41b31b4c7e20da487a0a8abc51cbabf70a6.zip
Merge branch 'v3-stable' into beta
Conflicts: ChangeLog
Diffstat (limited to 'sample.conf')
0 files changed, 0 insertions, 0 deletions