diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-02 12:19:44 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-02 12:19:44 +0200 |
commit | e92a0db46dfd2661a92e41a678d982ce6d3eedde (patch) | |
tree | 4e09eb39484f497e8eab28bf85bb933e139df49d /syslog-tst.conf | |
parent | 8a819d6a0623c0854462dd2dc632700f9a5c576c (diff) | |
parent | e4f012eb60f6531f964557ba9eac54048ae2bef8 (diff) | |
download | rsyslog-e92a0db46dfd2661a92e41a678d982ce6d3eedde.tar.gz rsyslog-e92a0db46dfd2661a92e41a678d982ce6d3eedde.tar.xz rsyslog-e92a0db46dfd2661a92e41a678d982ce6d3eedde.zip |
Merge branch 'master' into oracle
Conflicts:
Makefile.am
Diffstat (limited to 'syslog-tst.conf')
0 files changed, 0 insertions, 0 deletions