diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-08-30 15:52:00 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-08-30 15:52:00 +0200 |
| commit | 43dd1bc0e659f3ddce2f2c5138864d36a5647846 (patch) | |
| tree | 3c99854d11464d86f49870902e52e67c594ce196 /action.c | |
| parent | c1108d7af1ca04b2c485bd87a8cbbf044ffde6fb (diff) | |
| parent | 645a8541d5bbd7cfc0dd9e9f434cce280acf7af8 (diff) | |
| download | rsyslog-43dd1bc0e659f3ddce2f2c5138864d36a5647846.tar.gz rsyslog-43dd1bc0e659f3ddce2f2c5138864d36a5647846.tar.xz rsyslog-43dd1bc0e659f3ddce2f2c5138864d36a5647846.zip | |
Merge branch 'v5-stable' into beta
Conflicts:
ChangeLog
Diffstat (limited to 'action.c')
0 files changed, 0 insertions, 0 deletions