diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-01-09 16:01:32 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-01-09 16:01:32 +0100 |
commit | 2791bd82f5305c4b514ebf50e97de686961d9dd1 (patch) | |
tree | d8193715d8a2f4c6f8132bc85ff5790aefe1c386 /plugins/imkmsg/imkmsg.c | |
parent | ae4f1c56d9497236023e7be8f2d1d8050aa41068 (diff) | |
parent | 8a344f0ba6938591dc91a5fc2218eaa89c6fecd6 (diff) | |
download | rsyslog-2791bd82f5305c4b514ebf50e97de686961d9dd1.tar.gz rsyslog-2791bd82f5305c4b514ebf50e97de686961d9dd1.tar.bz2 rsyslog-2791bd82f5305c4b514ebf50e97de686961d9dd1.zip |
Merge branch 'v7-stable'
Conflicts:
ChangeLog
Diffstat (limited to 'plugins/imkmsg/imkmsg.c')
0 files changed, 0 insertions, 0 deletions