diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-24 18:08:14 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-24 18:08:14 +0100 |
| commit | 590252c2275da8d4ed777a3bb84a227327b3871a (patch) | |
| tree | 6c3ca921a3fa87add582317a92c270a30685d260 /action.c | |
| parent | b41fc354ede3baec9740cb7e6a2f609824269836 (diff) | |
| parent | b029d4751ac77f7ee4c7035c522e6c85601035c1 (diff) | |
| download | rsyslog-590252c2275da8d4ed777a3bb84a227327b3871a.tar.gz rsyslog-590252c2275da8d4ed777a3bb84a227327b3871a.tar.xz rsyslog-590252c2275da8d4ed777a3bb84a227327b3871a.zip | |
Merge branch 'v5-stable' into v5-stable-newstats
Conflicts:
configure.ac
Diffstat (limited to 'action.c')
0 files changed, 0 insertions, 0 deletions