summaryrefslogtreecommitdiffstats
path: root/doc/status.html
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-07-15 11:47:58 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-07-15 11:47:58 +0200
commit9db3e14e45f66356d1e6f5e2337b4ef3a45a6ce8 (patch)
tree10cf3b035fbd24ab2504b4cc7c1118878923e8b7 /doc/status.html
parent5416a94bbe9a24ad9236755a9e21944685fc231b (diff)
parentf7894c401fdb8a2ad7bb3a1d87a74d438cc366c3 (diff)
downloadrsyslog-9db3e14e45f66356d1e6f5e2337b4ef3a45a6ce8.tar.gz
rsyslog-9db3e14e45f66356d1e6f5e2337b4ef3a45a6ce8.tar.xz
rsyslog-9db3e14e45f66356d1e6f5e2337b4ef3a45a6ce8.zip
Merge branch 'beta'
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'doc/status.html')
0 files changed, 0 insertions, 0 deletions