diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-17 18:35:07 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-17 18:35:07 +0100 |
| commit | 5cf53628ac8ec8f07ee1c4d7f4bd0faeac43ab36 (patch) | |
| tree | 53ae95fd0f749a3db5b27342e65e07fc03a2e037 /doc | |
| parent | d94ba2a5468089b657e0779ddd2f4585face37e3 (diff) | |
| parent | 59c99b2d8b23f8903e2130b7a149981afe1a8bd3 (diff) | |
| download | rsyslog-5cf53628ac8ec8f07ee1c4d7f4bd0faeac43ab36.tar.gz rsyslog-5cf53628ac8ec8f07ee1c4d7f4bd0faeac43ab36.tar.xz rsyslog-5cf53628ac8ec8f07ee1c4d7f4bd0faeac43ab36.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions