diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-21 12:04:59 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-21 12:04:59 +0200 |
| commit | 04ca2611194affee966344db20cdaa7c663f99d9 (patch) | |
| tree | 9bdb3df245f2cca5ee687de81ce168c471c4d170 /contrib | |
| parent | 3187982c3c94e5eac257e206f19fa7326c8e7739 (diff) | |
| parent | 9407f2a3e08940d0dd0367c5904654f5a56117af (diff) | |
| download | rsyslog-04ca2611194affee966344db20cdaa7c663f99d9.tar.gz rsyslog-04ca2611194affee966344db20cdaa7c663f99d9.tar.xz rsyslog-04ca2611194affee966344db20cdaa7c663f99d9.zip | |
Merge branch 'v4-stable' into v4-beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/imrelp/imrelp.c
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions