diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-05-15 14:18:18 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-05-15 14:18:18 +0200 |
| commit | 07b447fcbae051c55127a96c7117c1bfee1baa93 (patch) | |
| tree | 9efad883a92dcb51c7e480793ebc49c2ca34337c /doc/rsyslog_conf.html | |
| parent | 8aea6a1d9d5a623018747844b65cf6c0dfd57192 (diff) | |
| parent | 5674b8ef46ad0ec7c3c795f7981b6fd2d0b8330e (diff) | |
| download | rsyslog-07b447fcbae051c55127a96c7117c1bfee1baa93.tar.gz rsyslog-07b447fcbae051c55127a96c7117c1bfee1baa93.tar.xz rsyslog-07b447fcbae051c55127a96c7117c1bfee1baa93.zip | |
Merge branch 'v2-stable' into v3-stable
Conflicts:
ChangeLog
configure.ac
Diffstat (limited to 'doc/rsyslog_conf.html')
0 files changed, 0 insertions, 0 deletions