diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-20 11:48:17 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-20 11:48:17 +0200 |
| commit | ac32d356b5b776e0ca549d5c689a8932af4c2171 (patch) | |
| tree | d8aa8631ec9b7aae850801be4076d71a652e483e /java | |
| parent | fd4a54698cee48da073622f7d6ac49c94ccb1808 (diff) | |
| parent | 1d86889922cb9232819b4451afce091e8a0ad938 (diff) | |
| download | rsyslog-ac32d356b5b776e0ca549d5c689a8932af4c2171.tar.gz rsyslog-ac32d356b5b776e0ca549d5c689a8932af4c2171.tar.xz rsyslog-ac32d356b5b776e0ca549d5c689a8932af4c2171.zip | |
Merge branch 'v5-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
doc/rsyslog_conf_modules.html
plugins/imrelp/imrelp.c
Diffstat (limited to 'java')
0 files changed, 0 insertions, 0 deletions