diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-23 11:43:12 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-23 11:43:12 +0200 |
| commit | b38a2208f4f82b80679fca364cac8e66ee348d74 (patch) | |
| tree | 94ff3ee49a31c031038028caa0efa4228de39f4a /syslog-tst.conf | |
| parent | 251e48a34cca7fa7578cf82b3d95557878e409f7 (diff) | |
| parent | 2e51c75938f18b8d637195400827f23c5ac996a1 (diff) | |
| download | rsyslog-b38a2208f4f82b80679fca364cac8e66ee348d74.tar.gz rsyslog-b38a2208f4f82b80679fca364cac8e66ee348d74.tar.xz rsyslog-b38a2208f4f82b80679fca364cac8e66ee348d74.zip | |
Merge branch 'v3-stable' into beta
Conflicts:
ChangeLog
runtime/queue.c
Diffstat (limited to 'syslog-tst.conf')
0 files changed, 0 insertions, 0 deletions