diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-07-19 10:56:05 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-07-19 10:56:05 +0200 |
commit | c67e6cb79e3e5b1eaa61662abc7c830fa084b533 (patch) | |
tree | 200d504823e0583d73960933c018efe085966f2f /plugins/imrelp/imrelp.c | |
parent | 0f7622dd1f9a4b146324d432d421e46cdaa06c09 (diff) | |
parent | 1207e1a76e3af6bed3d824b2c44c5a2322d2a574 (diff) | |
download | rsyslog-c67e6cb79e3e5b1eaa61662abc7c830fa084b533.tar.gz rsyslog-c67e6cb79e3e5b1eaa61662abc7c830fa084b533.tar.bz2 rsyslog-c67e6cb79e3e5b1eaa61662abc7c830fa084b533.zip |
Merge branch 'v7-stable'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'plugins/imrelp/imrelp.c')
0 files changed, 0 insertions, 0 deletions