diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-03-11 15:15:34 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-03-11 15:15:34 +0100 |
| commit | ae7a01e137f14055f9472408d0cf3ebf9893afba (patch) | |
| tree | 37af475499d6dd82b986f34c4a53db2ecbd071bd /syslog-tst.conf | |
| parent | 24a36fd14226ccf5f139c07252f05f3db124604e (diff) | |
| parent | 7f43af08fec0824c30c5bb1ddb9b96427828c987 (diff) | |
| download | rsyslog-ae7a01e137f14055f9472408d0cf3ebf9893afba.tar.gz rsyslog-ae7a01e137f14055f9472408d0cf3ebf9893afba.tar.xz rsyslog-ae7a01e137f14055f9472408d0cf3ebf9893afba.zip | |
Merge branch 'v3-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'syslog-tst.conf')
0 files changed, 0 insertions, 0 deletions