diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-09 17:37:47 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-09 17:37:47 +0100 |
| commit | 6124df83ff69682c0bc6d29eeaea7f9a1b1a2317 (patch) | |
| tree | 112d86ed8645b6a6435380855329d3a4a77f111e /syslog-tst.conf | |
| parent | fe52af4d409a30d50e66f870b9eb503bee47cbfb (diff) | |
| parent | 8d79906d500c5760f093123b3ef3c43508ffce58 (diff) | |
| download | rsyslog-6124df83ff69682c0bc6d29eeaea7f9a1b1a2317.tar.gz rsyslog-6124df83ff69682c0bc6d29eeaea7f9a1b1a2317.tar.xz rsyslog-6124df83ff69682c0bc6d29eeaea7f9a1b1a2317.zip | |
Merge branch 'v5-beta' into v5-devel
Conflicts:
ChangeLog
Diffstat (limited to 'syslog-tst.conf')
0 files changed, 0 insertions, 0 deletions