summaryrefslogtreecommitdiffstats
path: root/plugins/pmcisconames
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-04-12 15:15:33 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-04-12 15:15:33 +0200
commit2623f4e4df0f3f7deaa23ed8b1eea89f7fce6f48 (patch)
tree721b623150baa67e9254d9176eac04773a395e9b /plugins/pmcisconames
parent7177afe484e5ded6b0d65d19e18489cdacfeb0fa (diff)
parent05efee80c1f9ef74b912d12709919153b8d1440a (diff)
downloadrsyslog-2623f4e4df0f3f7deaa23ed8b1eea89f7fce6f48.tar.gz
rsyslog-2623f4e4df0f3f7deaa23ed8b1eea89f7fce6f48.tar.xz
rsyslog-2623f4e4df0f3f7deaa23ed8b1eea89f7fce6f48.zip
Merge branch 'v6-stable'
Conflicts: ChangeLog
Diffstat (limited to 'plugins/pmcisconames')
0 files changed, 0 insertions, 0 deletions