diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-29 13:52:55 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-29 13:52:55 +0200 |
commit | 2ed8e41b31b4c7e20da487a0a8abc51cbabf70a6 (patch) | |
tree | ac069b67131b3e1f470cb983a32d0b2f54ca70bd /sample.conf | |
parent | 8d8befaeca0d9ed3f096780e499a3231f16585c4 (diff) | |
parent | 43c45bfebcc672d6fbec2d4d659609d1ea48eda6 (diff) | |
download | rsyslog-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