diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-15 12:31:56 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-15 12:31:56 +0200 |
| commit | 706ddb492345e53d36084d0b843f237da865c6d4 (patch) | |
| tree | 5c21c06e0f4c0ce15fa2d8413c149d687be43e72 /plugins/imtcp | |
| parent | a3a3a322d8c7d40dfed0765457d26a484a624bce (diff) | |
| parent | 2014cf85627b8774e8c36ddecad04f1ebf43020b (diff) | |
| download | rsyslog-706ddb492345e53d36084d0b843f237da865c6d4.tar.gz rsyslog-706ddb492345e53d36084d0b843f237da865c6d4.tar.bz2 rsyslog-706ddb492345e53d36084d0b843f237da865c6d4.zip | |
Merge branch 'master' into master-ratelimit
Conflicts:
ChangeLog
doc/v7compatibility.html
Diffstat (limited to 'plugins/imtcp')
0 files changed, 0 insertions, 0 deletions