diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-10 13:51:16 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-10 13:51:16 +0100 |
| commit | 2d232617fa250d913800cddda9d0003957303edf (patch) | |
| tree | fd2a63e5e7bc466e505f02692692c1e71b202dd7 /doc/rsyslog_conf_global.html | |
| parent | cd5f653ad8fa87727bf3ab12b90a41babaaf1ee5 (diff) | |
| parent | b4dd4ef83a51bc91a5861c0dd2809263e60cd05d (diff) | |
| download | rsyslog-2d232617fa250d913800cddda9d0003957303edf.tar.gz rsyslog-2d232617fa250d913800cddda9d0003957303edf.tar.xz rsyslog-2d232617fa250d913800cddda9d0003957303edf.zip | |
Merge branch 'v4-beta' into v4-devel
Conflicts:
ChangeLog
Diffstat (limited to 'doc/rsyslog_conf_global.html')
0 files changed, 0 insertions, 0 deletions