diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-15 10:23:19 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-15 10:23:19 +0200 |
| commit | 72c235744023d10e1a9b44c90b65a6b34029e471 (patch) | |
| tree | d6e14606cc430beeead93d68fc46de7ed82915c1 /plugins/imtcp | |
| parent | 9105946272e4190e042981f35994b3f044ebb0d3 (diff) | |
| parent | 254dc643c260c0f4a489188b2277811a4104063e (diff) | |
| download | rsyslog-72c235744023d10e1a9b44c90b65a6b34029e471.tar.gz rsyslog-72c235744023d10e1a9b44c90b65a6b34029e471.tar.xz rsyslog-72c235744023d10e1a9b44c90b65a6b34029e471.zip | |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
Diffstat (limited to 'plugins/imtcp')
0 files changed, 0 insertions, 0 deletions