diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-09 15:07:02 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-09 15:07:02 +0100 |
commit | 1414dacae03c90c1ab83c04227474ecac7d40c76 (patch) | |
tree | 287761f728e2e84aaec118e7664495dd5d196b04 /test.conf | |
parent | 5c0cff0e5a3a1a00b6176af7e4fefbdc5af8f9a3 (diff) | |
parent | 791b16ce06d75944e338a6e5fa14c0394bde6f1d (diff) | |
download | rsyslog-1414dacae03c90c1ab83c04227474ecac7d40c76.tar.gz rsyslog-1414dacae03c90c1ab83c04227474ecac7d40c76.tar.xz rsyslog-1414dacae03c90c1ab83c04227474ecac7d40c76.zip |
Merge branch 'v5-stable' into v6-stable
Diffstat (limited to 'test.conf')
0 files changed, 0 insertions, 0 deletions