diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-11 11:46:32 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-11 11:46:32 +0100 |
| commit | ffa57b17b270be441c64161cd1a3c3123b58ee26 (patch) | |
| tree | eaec0a691437ffdb87795f4236a7e972b38ef746 /tests/cfg1.cfgtest | |
| parent | fd26a42bdc04eaf497cafd9ef806a54f3de1a7e9 (diff) | |
| parent | 9a53ec419e9d9e25a81b26a01ce5b035631e321a (diff) | |
| download | rsyslog-ffa57b17b270be441c64161cd1a3c3123b58ee26.tar.gz rsyslog-ffa57b17b270be441c64161cd1a3c3123b58ee26.tar.xz rsyslog-ffa57b17b270be441c64161cd1a3c3123b58ee26.zip | |
Merge branch 'v5-stable' into v5-beta
Conflicts:
tests/Makefile.am
Diffstat (limited to 'tests/cfg1.cfgtest')
0 files changed, 0 insertions, 0 deletions