summaryrefslogtreecommitdiffstats
path: root/doc/status.html
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-08-07 10:36:54 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-08-07 10:36:54 +0200
commit0a7f964436af73f2e7fbd403b563f8d5a743f4a5 (patch)
treea05e8e7617a8ccc43bc32fdefa0709e72675e38c /doc/status.html
parent97829d034dfaa9d05b8d8c5646b9884de0382bb6 (diff)
parent66300192944fe2c4390e53549ed51b4b25e79524 (diff)
downloadrsyslog-0a7f964436af73f2e7fbd403b563f8d5a743f4a5.tar.gz
rsyslog-0a7f964436af73f2e7fbd403b563f8d5a743f4a5.tar.xz
rsyslog-0a7f964436af73f2e7fbd403b563f8d5a743f4a5.zip
Merge branch 'beta'
Conflicts: doc/rsyslog_conf.html
Diffstat (limited to 'doc/status.html')
0 files changed, 0 insertions, 0 deletions