summaryrefslogtreecommitdiffstats
path: root/doc/manual.html
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-11-25 14:53:20 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2009-11-25 14:53:20 +0100
commitc21d381030a5b6ae3bc20a9cfb84c4c04b0922ff (patch)
tree02af25a2ce238b6648391d8dcf577e3360398309 /doc/manual.html
parent3fb01ebcc0da98fee5fa5f854fad5d347d3f5649 (diff)
parent3313c4d6682993db5ef89b9d55ce910b63e20835 (diff)
downloadrsyslog-c21d381030a5b6ae3bc20a9cfb84c4c04b0922ff.tar.gz
rsyslog-c21d381030a5b6ae3bc20a9cfb84c4c04b0922ff.tar.xz
rsyslog-c21d381030a5b6ae3bc20a9cfb84c4c04b0922ff.zip
Merge branch 'beta'
Conflicts: ChangeLog
Diffstat (limited to 'doc/manual.html')
0 files changed, 0 insertions, 0 deletions