diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-01-08 15:59:09 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-01-08 15:59:09 +0100 |
commit | ae4f1c56d9497236023e7be8f2d1d8050aa41068 (patch) | |
tree | f947548ebc13b80f2e1b1cd44ea5c074b01bae75 /plugins/imkmsg/imkmsg.c | |
parent | cd43df6fdbbe1062242f58db2174e8c45aaf64dc (diff) | |
parent | 55d6eef1be47df7312e8e59a64ad9b0de6298f2f (diff) | |
download | rsyslog-ae4f1c56d9497236023e7be8f2d1d8050aa41068.tar.gz rsyslog-ae4f1c56d9497236023e7be8f2d1d8050aa41068.tar.bz2 rsyslog-ae4f1c56d9497236023e7be8f2d1d8050aa41068.zip |
Merge branch 'v7-stable'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'plugins/imkmsg/imkmsg.c')
0 files changed, 0 insertions, 0 deletions