diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-09-29 10:09:51 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-09-29 10:09:51 +0200 |
commit | 8d8d1f01e1cd6ae372088a3ebddc27983e9a0185 (patch) | |
tree | 8aa389a25e899e4ebe26554d3228307020056c75 /plugins/omgssapi | |
parent | b81c4252e808de51c022bbfda96a91ddc697e86c (diff) | |
parent | 8bab264ba168b5fee36a7b45020e5e2172c74224 (diff) | |
download | rsyslog-8d8d1f01e1cd6ae372088a3ebddc27983e9a0185.tar.gz rsyslog-8d8d1f01e1cd6ae372088a3ebddc27983e9a0185.tar.xz rsyslog-8d8d1f01e1cd6ae372088a3ebddc27983e9a0185.zip |
Merge branch 'v4-beta' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'plugins/omgssapi')
0 files changed, 0 insertions, 0 deletions