diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-07 14:33:37 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-07 14:33:37 +0200 |
| commit | bfc6f6d599a4723b26708da5fddcc6db5c53fc21 (patch) | |
| tree | 6a316f837808e735790fced62a46142f4cf6b9e6 /doc/rsyslog_conf_global.html | |
| parent | da2039614ffd93b8fb1ebddf2ed3eb6dc873c1a5 (diff) | |
| parent | a192300aa26484c88aedd306fdb92d7752eee427 (diff) | |
| download | rsyslog-bfc6f6d599a4723b26708da5fddcc6db5c53fc21.tar.gz rsyslog-bfc6f6d599a4723b26708da5fddcc6db5c53fc21.tar.xz rsyslog-bfc6f6d599a4723b26708da5fddcc6db5c53fc21.zip | |
Merge branch 'v5-stable' into v5-stable-newstats
Conflicts:
configure.ac
Diffstat (limited to 'doc/rsyslog_conf_global.html')
0 files changed, 0 insertions, 0 deletions