diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-25 14:52:18 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-25 14:52:18 +0100 |
| commit | 3313c4d6682993db5ef89b9d55ce910b63e20835 (patch) | |
| tree | b8f3a5ea0d27bedb68726b8aa2be530b95cce13c /doc | |
| parent | 35fa257f37f6376887c1aa0a3a77f4ed249fd22a (diff) | |
| parent | 52a0120a3845bd17855156dd59ed6beaf9658e0f (diff) | |
| download | rsyslog-3313c4d6682993db5ef89b9d55ce910b63e20835.tar.gz rsyslog-3313c4d6682993db5ef89b9d55ce910b63e20835.tar.xz rsyslog-3313c4d6682993db5ef89b9d55ce910b63e20835.zip | |
Merge branch 'v5-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
tests/Makefile.am
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions