diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-10 10:17:18 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-10 10:17:18 +0200 |
| commit | 6625450cbeee6cd4dc0ecc7418e552833708e95c (patch) | |
| tree | 8eb6bb2d4bf667ee87df5337d87d14d992ba0c17 /doc | |
| parent | 8ce2e3917705186cc708faa68d6b3faeebd0fa32 (diff) | |
| parent | b3d54ce6ffa3925e4cf3ee3d4dfafdfeb552e6dd (diff) | |
| download | rsyslog-6625450cbeee6cd4dc0ecc7418e552833708e95c.tar.gz rsyslog-6625450cbeee6cd4dc0ecc7418e552833708e95c.tar.xz rsyslog-6625450cbeee6cd4dc0ecc7418e552833708e95c.zip | |
Merge branch 'v5-beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions