diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-03 18:25:27 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-03 18:25:27 +0200 |
| commit | fdcaca6b85d65ef2c9b4814cc4a9adda4568e24f (patch) | |
| tree | 21e07bd93a7bc45fd9b5b1084a88a0afae51e085 /doc/manual.html | |
| parent | fe50701280c9005d220d9c6eee78afc40fb59865 (diff) | |
| parent | fe8ac119f75bc6d2763896b8e1a85ecfeb41bffb (diff) | |
| download | rsyslog-fdcaca6b85d65ef2c9b4814cc4a9adda4568e24f.tar.gz rsyslog-fdcaca6b85d65ef2c9b4814cc4a9adda4568e24f.tar.xz rsyslog-fdcaca6b85d65ef2c9b4814cc4a9adda4568e24f.zip | |
Merge branch 'v5-stable' into v5-beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'doc/manual.html')
0 files changed, 0 insertions, 0 deletions