diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-08-15 12:59:24 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-08-15 12:59:24 +0200 |
commit | 8a1751d1c9cb463aeb3b9c80bff907bbe3d5cd8a (patch) | |
tree | 21a5726fa380372c08e8975e9c49f9bb6d91feb0 /contrib | |
parent | a61e548958044f9efa013b5911d130ae1930448f (diff) | |
parent | 3f2856b4b5010dfcaa720b292dc3a655e7b9f6da (diff) | |
download | rsyslog-8a1751d1c9cb463aeb3b9c80bff907bbe3d5cd8a.tar.gz rsyslog-8a1751d1c9cb463aeb3b9c80bff907bbe3d5cd8a.tar.xz rsyslog-8a1751d1c9cb463aeb3b9c80bff907bbe3d5cd8a.zip |
Merge branch 'v3-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/rsyslog_ng_comparison.html
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions