diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-05-20 16:45:41 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-05-20 16:45:41 +0200 |
commit | 1bac66db05ecbc078d009c40fcb40093cc7b0bc8 (patch) | |
tree | 96c9ac41d9823d2b62a5502ef432a0b3e6bc25e8 /doc/rsconf1_actionexeconlywhenpreviousissuspended.html | |
parent | 1ab2bb26d20eaffc36999cb2bb1d7c9be3994c56 (diff) | |
parent | fcb747c57d2b8beacade7194f99fa1de8fb0a4fb (diff) | |
download | rsyslog-1bac66db05ecbc078d009c40fcb40093cc7b0bc8.tar.gz rsyslog-1bac66db05ecbc078d009c40fcb40093cc7b0bc8.tar.xz rsyslog-1bac66db05ecbc078d009c40fcb40093cc7b0bc8.zip |
Merge branch 'v4-stable' into v4-devel
Conflicts:
ChangeLog
Diffstat (limited to 'doc/rsconf1_actionexeconlywhenpreviousissuspended.html')
0 files changed, 0 insertions, 0 deletions