diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-27 09:39:45 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-27 09:39:45 +0200 |
| commit | f3a7232069730e94519d7cc06fe0d82bf21b0162 (patch) | |
| tree | 7e1a67cc37d8daf639ef6a9285be5e33cd48c201 /doc | |
| parent | 5d67d98c35da731eab933dbfd858a0e009aa58de (diff) | |
| parent | 9b305b5de54e4dd84a689e7642043253a1bbc94b (diff) | |
| download | rsyslog-f3a7232069730e94519d7cc06fe0d82bf21b0162.tar.gz rsyslog-f3a7232069730e94519d7cc06fe0d82bf21b0162.tar.xz rsyslog-f3a7232069730e94519d7cc06fe0d82bf21b0162.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
ChangeLog
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions