diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-15 18:20:33 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-15 18:20:33 +0200 |
| commit | ac272a5aeb44063f6fbfc8e30c6052166c185b24 (patch) | |
| tree | a552f5a6b3bd7b7ffb127b6f65fa9e3f48c676ee /doc/manual.html | |
| parent | 46287fa5e8f2e961e9f9cb48df08d171ea510ec8 (diff) | |
| parent | 6ce405a13e6d4722c33cd6dcce618ee3853df6a9 (diff) | |
| download | rsyslog-ac272a5aeb44063f6fbfc8e30c6052166c185b24.tar.gz rsyslog-ac272a5aeb44063f6fbfc8e30c6052166c185b24.tar.xz rsyslog-ac272a5aeb44063f6fbfc8e30c6052166c185b24.zip | |
Merge branch 'v6-stable' into beta
Conflicts:
plugins/omudpspoof/omudpspoof.c
tools/syslogd.c
Diffstat (limited to 'doc/manual.html')
0 files changed, 0 insertions, 0 deletions