diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-04 14:58:51 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-04 14:58:51 +0100 |
| commit | 062c1ffbdce422c0df3b5314d25d935f1bd2a9e1 (patch) | |
| tree | 4aacc6da01a86dbea578e9e54bea8db76e3bd6a4 /README | |
| parent | 75a585a7e26d4d6cf59157cf62584c139af1527c (diff) | |
| parent | 9be853a2c8d0fd7fdc415200af57493ad5a00feb (diff) | |
| download | rsyslog-6.1.5.tar.gz rsyslog-6.1.5.tar.xz rsyslog-6.1.5.zip | |
Merge branch 'master-tcpsrv-mt'v6.1.5
Conflicts:
ChangeLog
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions