diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-11-11 12:58:53 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-11-11 12:58:53 +0100 |
| commit | c9078c722003ac87e8b39363ed9b8b70d2812dd9 (patch) | |
| tree | 51b44e6eab1a7cb5f80547252468e3c351c8cb36 /rsyslog.conf | |
| parent | 05bd696ebb7766f33b3ae176b841bcecb0bfedfc (diff) | |
| parent | 4cfbf894fd0caebaf65e1b7ffcb5725a530cf67d (diff) | |
| download | rsyslog-c9078c722003ac87e8b39363ed9b8b70d2812dd9.tar.gz rsyslog-c9078c722003ac87e8b39363ed9b8b70d2812dd9.tar.xz rsyslog-c9078c722003ac87e8b39363ed9b8b70d2812dd9.zip | |
Merge branch 'v3-stable' into beta
Conflicts:
ChangeLog
doc/manual.html
Diffstat (limited to 'rsyslog.conf')
0 files changed, 0 insertions, 0 deletions