diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-08-30 15:40:20 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-08-30 15:40:20 +0200 |
| commit | a34d37a9e32a851002c07538532789b33d91f862 (patch) | |
| tree | fa092e28103c40dc1b72aa10685edde56b415c06 /java | |
| parent | 53135efb4e793da3eb94d9e42c340484192aefcf (diff) | |
| parent | 645a8541d5bbd7cfc0dd9e9f434cce280acf7af8 (diff) | |
| download | rsyslog-a34d37a9e32a851002c07538532789b33d91f862.tar.gz rsyslog-a34d37a9e32a851002c07538532789b33d91f862.tar.xz rsyslog-a34d37a9e32a851002c07538532789b33d91f862.zip | |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
Diffstat (limited to 'java')
0 files changed, 0 insertions, 0 deletions