diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-11-24 12:57:46 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-11-24 12:57:46 +0100 |
| commit | b4da4fdac930edc10b6184422aee02f56b631fc5 (patch) | |
| tree | 1c01b6c2a36536ac8bed9d09e0fe2755a6bab705 /doc/rsyslog_conf.html | |
| parent | c470879eff9256612cfcff4938ed81425b3cc3c6 (diff) | |
| parent | 600bc06638f0508775be4a78bb85f15bd6025a2c (diff) | |
| download | rsyslog-b4da4fdac930edc10b6184422aee02f56b631fc5.tar.gz rsyslog-b4da4fdac930edc10b6184422aee02f56b631fc5.tar.xz rsyslog-b4da4fdac930edc10b6184422aee02f56b631fc5.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
configure.ac
Diffstat (limited to 'doc/rsyslog_conf.html')
0 files changed, 0 insertions, 0 deletions