diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-21 10:33:12 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-21 10:33:12 +0200 |
| commit | 8624f937523c1ca78cc1d78b8eba18f628ae9ab5 (patch) | |
| tree | 7e71ba0589075d3df7c708556d459879d1471cb5 /doc/rsyslog_conf_global.html | |
| parent | 191c51187ee54201954e5c73492a8bd5902044c7 (diff) | |
| parent | bd7542b51593739893922e8ec8fb6d7195d06cbe (diff) | |
| download | rsyslog-8624f937523c1ca78cc1d78b8eba18f628ae9ab5.tar.gz rsyslog-8624f937523c1ca78cc1d78b8eba18f628ae9ab5.tar.xz rsyslog-8624f937523c1ca78cc1d78b8eba18f628ae9ab5.zip | |
Merge branch 'v4-stable' into v4-beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'doc/rsyslog_conf_global.html')
0 files changed, 0 insertions, 0 deletions