summaryrefslogtreecommitdiffstats
path: root/rsyslog.conf
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-04-16 14:20:47 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-04-16 14:20:47 +0200
commit6339d1d8c858c8c748a8c631b564d6053f573fa8 (patch)
treeac6c6c9403ae2ad3dd3b3c66a1f595fcc86220a9 /rsyslog.conf
parentbc471f1d9046bf75a2e27d593ce9b13e4094ffdc (diff)
parent140d5cf0f80c40ee8db3c7b24176e45b00be0572 (diff)
downloadrsyslog-6339d1d8c858c8c748a8c631b564d6053f573fa8.tar.gz
rsyslog-6339d1d8c858c8c748a8c631b564d6053f573fa8.tar.xz
rsyslog-6339d1d8c858c8c748a8c631b564d6053f573fa8.zip
Merge branch 'debian_lenny' into v3-stable
Conflicts: ChangeLog
Diffstat (limited to 'rsyslog.conf')
0 files changed, 0 insertions, 0 deletions