summaryrefslogtreecommitdiffstats
path: root/plugins/imdiag
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-11-26 14:22:52 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2008-11-26 14:22:52 +0100
commit86614327c5d33da00042f0330160d9ea4804b3dc (patch)
tree6fb202d00fe2577a9ec3baf9dd32574a78dc398a /plugins/imdiag
parentdbc8762aebc66085d67bb04bb58bee56ce204596 (diff)
parent2275a915e02ca4fd1cd1b3c450b0089ae98bc907 (diff)
downloadrsyslog-86614327c5d33da00042f0330160d9ea4804b3dc.tar.gz
rsyslog-86614327c5d33da00042f0330160d9ea4804b3dc.tar.xz
rsyslog-86614327c5d33da00042f0330160d9ea4804b3dc.zip
Merge branch 'beta'
Conflicts: ChangeLog
Diffstat (limited to 'plugins/imdiag')
0 files changed, 0 insertions, 0 deletions