diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-08-30 14:53:31 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-08-30 14:53:31 +0200 |
| commit | 581daa5418548dda4c9b5438878559a1bbd4b087 (patch) | |
| tree | 1898549f1911901d716d171f9745c68dbb0a7403 /doc/manual.html | |
| parent | e4c44a77fd36539ff80f7d8b1257f70fd2e46ea5 (diff) | |
| parent | d654e51e2c54e6042a73ee6c95062c916161cdbe (diff) | |
| download | rsyslog-581daa5418548dda4c9b5438878559a1bbd4b087.tar.gz rsyslog-581daa5418548dda4c9b5438878559a1bbd4b087.tar.xz rsyslog-581daa5418548dda4c9b5438878559a1bbd4b087.zip | |
Merge branch 'v4-stable' into v4-beta
Conflicts:
ChangeLog
Diffstat (limited to 'doc/manual.html')
0 files changed, 0 insertions, 0 deletions