summaryrefslogtreecommitdiffstats
path: root/doc/manual.html
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-05-10 09:43:06 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-05-10 09:43:06 +0200
commite577d6bc7968ede9ed0cb8693b95478daf0ffb08 (patch)
treed2d35558840b174f42646fcb51d9cd897178b654 /doc/manual.html
parent4f70113457993c536fc948d5b3b3e69dc7a92a8a (diff)
parentd86a212255d9fd1ef3e4b0e99db1f4bfd0625260 (diff)
downloadrsyslog-e577d6bc7968ede9ed0cb8693b95478daf0ffb08.tar.gz
rsyslog-e577d6bc7968ede9ed0cb8693b95478daf0ffb08.tar.xz
rsyslog-e577d6bc7968ede9ed0cb8693b95478daf0ffb08.zip
Merge branch 'v5-stable' into v6-stable
Conflicts: ChangeLog
Diffstat (limited to 'doc/manual.html')
0 files changed, 0 insertions, 0 deletions