diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-09 13:46:54 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-09 13:46:54 +0200 |
commit | 9b34b305d8de2012a969675148950b7e10a1924b (patch) | |
tree | ce22e558b84cf418307a0e4ae1c2c19cafb9bbe2 /plugins/omoracle/omoracle.c | |
parent | aacb6dcbf49b75b223de09aa74c11c2f22f9da27 (diff) | |
parent | a5b4cb1681174ad221a8440422e4cd0da0e32064 (diff) | |
download | rsyslog-9b34b305d8de2012a969675148950b7e10a1924b.tar.gz rsyslog-9b34b305d8de2012a969675148950b7e10a1924b.tar.bz2 rsyslog-9b34b305d8de2012a969675148950b7e10a1924b.zip |
Merge branch 'master' into nextmaster
Conflicts:
ChangeLog
Diffstat (limited to 'plugins/omoracle/omoracle.c')
0 files changed, 0 insertions, 0 deletions