diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-27 11:25:59 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-27 11:25:59 +0100 |
| commit | fdcf69caf9754a2d7464856fb90e634a6be9d65e (patch) | |
| tree | c89c6650af3170d9a92831132bd99d75fb511cf8 /java/com/rsyslog | |
| parent | cca05921dcfab557a4743a56c78683e4c1113e2a (diff) | |
| parent | c129ddcc637875442dbf9e0869f5eafbd08199ae (diff) | |
| download | rsyslog-fdcf69caf9754a2d7464856fb90e634a6be9d65e.tar.gz rsyslog-fdcf69caf9754a2d7464856fb90e634a6be9d65e.tar.xz rsyslog-fdcf69caf9754a2d7464856fb90e634a6be9d65e.zip | |
Merge branch 'v5-stable-newstats' into v5-devel
Conflicts:
configure.ac
Diffstat (limited to 'java/com/rsyslog')
0 files changed, 0 insertions, 0 deletions