diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-16 08:45:57 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-16 08:45:57 +0200 |
commit | 1e0e9e67f073a4414ac03599b4ff8994ff30bc05 (patch) | |
tree | 947238856e69d5b248b6928ae455a034705dedda /plugins/omgssapi/omgssapi.c | |
parent | cd118cfcc22ea283c8d0112aeedc3f0d8b42d8a8 (diff) | |
parent | 3ed4b2cd3ebaf6f4c377ba2e03ef52c2e8a985b6 (diff) | |
download | rsyslog-1e0e9e67f073a4414ac03599b4ff8994ff30bc05.tar.gz rsyslog-1e0e9e67f073a4414ac03599b4ff8994ff30bc05.tar.bz2 rsyslog-1e0e9e67f073a4414ac03599b4ff8994ff30bc05.zip |
Merge branch 'david-master' into master
Conflicts:
ChangeLog
runtime/msg.c
Diffstat (limited to 'plugins/omgssapi/omgssapi.c')
0 files changed, 0 insertions, 0 deletions