diff options
| author | Andre Lorbach <alorbach@adiscon.com> | 2011-08-11 11:03:19 +0200 |
|---|---|---|
| committer | Andre Lorbach <alorbach@adiscon.com> | 2011-08-11 11:03:19 +0200 |
| commit | 1eff0e2ebee9b6a53a6b77cdc106bbf3b5d62b55 (patch) | |
| tree | d98787fbe589edaa95eae64da96432e4614b47d5 /action.c | |
| parent | b8d5cd810008f620c789c6969e8dab1bf2219239 (diff) | |
| parent | 00d594348af514fbbbb5f581124ac524d507187f (diff) | |
| download | rsyslog-1eff0e2ebee9b6a53a6b77cdc106bbf3b5d62b55.tar.gz rsyslog-1eff0e2ebee9b6a53a6b77cdc106bbf3b5d62b55.tar.xz rsyslog-1eff0e2ebee9b6a53a6b77cdc106bbf3b5d62b55.zip | |
Merge branch 'v5-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'action.c')
0 files changed, 0 insertions, 0 deletions