diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-10 14:52:57 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-10 14:52:57 +0200 |
| commit | 370bfa988db48ede39e74bcfae0d1909ecb0af66 (patch) | |
| tree | f5dbcdd0549d6bd41380e6b995e8c037efa4b0b5 /java | |
| parent | 3d8f44648880b748199f9b33c4f9f84c7065199c (diff) | |
| parent | 184497d4cbc438d14d1dedb0b21e8b6e27990690 (diff) | |
| download | rsyslog-370bfa988db48ede39e74bcfae0d1909ecb0af66.tar.gz rsyslog-370bfa988db48ede39e74bcfae0d1909ecb0af66.tar.xz rsyslog-370bfa988db48ede39e74bcfae0d1909ecb0af66.zip | |
Merge branch 'v5-stable' into v5-beta
Conflicts:
ChangeLog
Diffstat (limited to 'java')
0 files changed, 0 insertions, 0 deletions