diff options
| author | Andre Lorbach <alorbach@adiscon.com> | 2011-08-05 14:17:11 +0200 |
|---|---|---|
| committer | Andre Lorbach <alorbach@adiscon.com> | 2011-08-05 14:17:11 +0200 |
| commit | d788daafa4e8bda5fe544718b5f420f22cd79996 (patch) | |
| tree | cc87c4680a6462f3b5c1a2c19cc92369c31b7e7d /doc/manual.html | |
| parent | 407a1b85d4917b5593d698ab5601aa7bc11da162 (diff) | |
| parent | a3953fbee90045b96bd5ef44b64883a6bff57fee (diff) | |
| download | rsyslog-d788daafa4e8bda5fe544718b5f420f22cd79996.tar.gz rsyslog-d788daafa4e8bda5fe544718b5f420f22cd79996.tar.xz rsyslog-d788daafa4e8bda5fe544718b5f420f22cd79996.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
ChangeLog
Diffstat (limited to 'doc/manual.html')
0 files changed, 0 insertions, 0 deletions