diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-27 09:46:41 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-27 09:46:41 +0200 |
| commit | 16dc3aab3db9b8db4cb4fc8d241d4cd5d5362b8a (patch) | |
| tree | 09945c52f5b465460a1ffd9b0f2fb2b3d8939c9f /action.c | |
| parent | f3d4d83ce5a921899775eb59997d9d954b2f423d (diff) | |
| parent | f3a7232069730e94519d7cc06fe0d82bf21b0162 (diff) | |
| download | rsyslog-16dc3aab3db9b8db4cb4fc8d241d4cd5d5362b8a.tar.gz rsyslog-16dc3aab3db9b8db4cb4fc8d241d4cd5d5362b8a.tar.xz rsyslog-16dc3aab3db9b8db4cb4fc8d241d4cd5d5362b8a.zip | |
Merge branch 'v5-stable' into beta
Conflicts:
ChangeLog
Diffstat (limited to 'action.c')
0 files changed, 0 insertions, 0 deletions