diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-11-18 12:32:21 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-11-18 12:32:21 +0100 |
commit | 2f1c53dbfe5f1e4bd79adaf55a1aa48de8d83144 (patch) | |
tree | ba6f5b6f310683d98a390908dc9965ecb1e86137 /plugins/omgssapi | |
parent | 4cfbf894fd0caebaf65e1b7ffcb5725a530cf67d (diff) | |
parent | 48319cd31f3d15f1417d4ebd8003d93978ad36a9 (diff) | |
download | rsyslog-2f1c53dbfe5f1e4bd79adaf55a1aa48de8d83144.tar.gz rsyslog-2f1c53dbfe5f1e4bd79adaf55a1aa48de8d83144.tar.xz rsyslog-2f1c53dbfe5f1e4bd79adaf55a1aa48de8d83144.zip |
Merge branch 'v2-stable' into v3-stable
Conflicts:
ChangeLog
Diffstat (limited to 'plugins/omgssapi')
0 files changed, 0 insertions, 0 deletions