diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-22 12:43:19 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-22 12:43:19 +0200 |
| commit | be0a6eb45830f486ea2ac755ee11f7503454aa08 (patch) | |
| tree | 41cd388f3bdf33bfbddbda20bd72e54ef95657a4 /plugins/imkmsg | |
| parent | 95fefbc12a71c26e02bb1de8628b3f70a6856b08 (diff) | |
| parent | 6bfc397b09eab1269a718f1bf661bb31cadd626b (diff) | |
| download | rsyslog-be0a6eb45830f486ea2ac755ee11f7503454aa08.tar.gz rsyslog-be0a6eb45830f486ea2ac755ee11f7503454aa08.tar.bz2 rsyslog-be0a6eb45830f486ea2ac755ee11f7503454aa08.zip | |
Merge branch 'v6-stable' into v7-stable
Conflicts:
configure.ac
doc/manual.html
template.c
Diffstat (limited to 'plugins/imkmsg')
0 files changed, 0 insertions, 0 deletions