diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-10 14:54:19 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-10 14:54:19 +0200 |
| commit | 68f7a7bfd21a63c6b3f753341ac48a8873a260a7 (patch) | |
| tree | 892717e2c79ab6c84691cbb6795d0953a602eb6d /action.c | |
| parent | 7f2b8c85dbce62f196002bc08108cc4182be481f (diff) | |
| parent | 184497d4cbc438d14d1dedb0b21e8b6e27990690 (diff) | |
| download | rsyslog-68f7a7bfd21a63c6b3f753341ac48a8873a260a7.tar.gz rsyslog-68f7a7bfd21a63c6b3f753341ac48a8873a260a7.tar.xz rsyslog-68f7a7bfd21a63c6b3f753341ac48a8873a260a7.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
ChangeLog
Diffstat (limited to 'action.c')
0 files changed, 0 insertions, 0 deletions