diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-08-31 13:12:19 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-08-31 13:12:19 +0200 |
| commit | e5d0f176fce7a96dbea164d13b4b549ecb424434 (patch) | |
| tree | 55d3332b63375fe37be478e7cf73a5fb4bf10597 /syslog-tst.conf | |
| parent | dd55f8311f9eba74bd17692696f1225f8df512d2 (diff) | |
| parent | 0509f1404170c5aff7c9a154fbe882f4d067b1e4 (diff) | |
| download | rsyslog-e5d0f176fce7a96dbea164d13b4b549ecb424434.tar.gz rsyslog-e5d0f176fce7a96dbea164d13b4b549ecb424434.tar.xz rsyslog-e5d0f176fce7a96dbea164d13b4b549ecb424434.zip | |
Merge branch 'beta'v6.3.5
Conflicts:
configure.ac
doc/manual.html
tests/Makefile.am
Diffstat (limited to 'syslog-tst.conf')
0 files changed, 0 insertions, 0 deletions