diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-17 15:26:11 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-17 15:26:11 +0200 |
commit | 16f06168e10d0315cc5d65516043809edd9d2232 (patch) | |
tree | 7d28755836998e5ff6a6a6f7ecea1fd0d9077a22 /tests/DevNull.cfgtest | |
parent | 0c7604dc27119122a3022c7bf094ffb5f8d59e6d (diff) | |
parent | f84c8c4e9637748bd3a6a985bd12afa6b50e9797 (diff) | |
download | rsyslog-16f06168e10d0315cc5d65516043809edd9d2232.tar.gz rsyslog-16f06168e10d0315cc5d65516043809edd9d2232.tar.xz rsyslog-16f06168e10d0315cc5d65516043809edd9d2232.zip |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
Diffstat (limited to 'tests/DevNull.cfgtest')
0 files changed, 0 insertions, 0 deletions