diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-21 15:03:53 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-21 15:03:53 +0200 |
commit | e7701775553a60efb050b0df497bb4df5df46d62 (patch) | |
tree | 5e8183f6bbb33e106624e8c9d9c3eab7a7006de9 /doc/v6compatibility.html | |
parent | 359ddad3c5dce82ab48964c1d8b804c4155ea39c (diff) | |
parent | 12102199c4b3a042fb91e1d52eb274f06e62213e (diff) | |
download | rsyslog-e7701775553a60efb050b0df497bb4df5df46d62.tar.gz rsyslog-e7701775553a60efb050b0df497bb4df5df46d62.tar.bz2 rsyslog-e7701775553a60efb050b0df497bb4df5df46d62.zip |
Merge branch 'v5-devel'
Conflicts:
ChangeLog
Diffstat (limited to 'doc/v6compatibility.html')
0 files changed, 0 insertions, 0 deletions