diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-12-20 18:24:02 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-12-20 18:24:02 +0100 |
| commit | af720e9f9dffa205cf4b323c2a420c1cca6ddc17 (patch) | |
| tree | 122929be8beb91c36005d9e722d0c2b4c114d9be /action.c | |
| parent | 832d6e1e2c88455be6bb0929591715499602ad56 (diff) | |
| parent | 74722b23317d556e86ad7fb77913c4c864c239c4 (diff) | |
| download | rsyslog-af720e9f9dffa205cf4b323c2a420c1cca6ddc17.tar.gz rsyslog-af720e9f9dffa205cf4b323c2a420c1cca6ddc17.tar.xz rsyslog-af720e9f9dffa205cf4b323c2a420c1cca6ddc17.zip | |
Merge branch 'v5-stable' into v5-stable-newstats
Conflicts:
ChangeLog
Diffstat (limited to 'action.c')
0 files changed, 0 insertions, 0 deletions