diff options
author | Andre Lorbach <alorbach@adiscon.com> | 2011-08-18 15:45:00 +0200 |
---|---|---|
committer | Andre Lorbach <alorbach@adiscon.com> | 2011-08-18 15:45:00 +0200 |
commit | c1108d7af1ca04b2c485bd87a8cbbf044ffde6fb (patch) | |
tree | bc313aaed75f9ac30098309ffd07fb5d72869910 /plugins/omgssapi | |
parent | 1eff0e2ebee9b6a53a6b77cdc106bbf3b5d62b55 (diff) | |
parent | 154747929f87010b444af2d552f980daafe451e6 (diff) | |
download | rsyslog-c1108d7af1ca04b2c485bd87a8cbbf044ffde6fb.tar.gz rsyslog-c1108d7af1ca04b2c485bd87a8cbbf044ffde6fb.tar.bz2 rsyslog-c1108d7af1ca04b2c485bd87a8cbbf044ffde6fb.zip |
Merge branch 'v5-stable' into beta
Conflicts:
ChangeLog
configure.ac
Diffstat (limited to 'plugins/omgssapi')
0 files changed, 0 insertions, 0 deletions