diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-13 08:18:08 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-13 08:18:08 +0200 |
| commit | b0d33ab78056f06dee06694990a71fc7895ddbb5 (patch) | |
| tree | ea4d633e8452b2f56df419d9e6bf5ec4da95e0b0 /action.c | |
| parent | 76b4c6547d5526a375ee217e2722a164c811c58c (diff) | |
| parent | d6a6666b66733e63255f806dd272a0b85e0f0c13 (diff) | |
| download | rsyslog-b0d33ab78056f06dee06694990a71fc7895ddbb5.tar.gz rsyslog-b0d33ab78056f06dee06694990a71fc7895ddbb5.tar.xz rsyslog-b0d33ab78056f06dee06694990a71fc7895ddbb5.zip | |
Merge branch 'v5-stable' into beta
Conflicts:
ChangeLog
Diffstat (limited to 'action.c')
0 files changed, 0 insertions, 0 deletions