summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-01-12 14:48:38 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2009-01-12 14:48:38 +0100
commit43b9df51ba85f5703c12088884649c6bcf568b5a (patch)
tree0bbbc0199455b8533855603490de40ea22d33832 /doc
parent98624f1bc46b8fd259bc1096022df5fc642e90bf (diff)
parent20ff1ed403f05606b68c13e4d5c591c6b8706f86 (diff)
downloadrsyslog-43b9df51ba85f5703c12088884649c6bcf568b5a.tar.gz
rsyslog-43b9df51ba85f5703c12088884649c6bcf568b5a.tar.xz
rsyslog-43b9df51ba85f5703c12088884649c6bcf568b5a.zip
Merge branch 'debian_lenny' into v3-stable
Conflicts: ChangeLog
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions