diff options
| author | Andre Lorbach <alorbach@adiscon.com> | 2011-08-05 14:19:19 +0200 |
|---|---|---|
| committer | Andre Lorbach <alorbach@adiscon.com> | 2011-08-05 14:19:19 +0200 |
| commit | f7ad5aeff03833879957ef00136610d1138a7212 (patch) | |
| tree | 7184cfd244339efc014f4007829ec316ab4aa0b3 /java | |
| parent | 4e11040e04c7147f9787e2a496591f7ada190480 (diff) | |
| parent | d788daafa4e8bda5fe544718b5f420f22cd79996 (diff) | |
| download | rsyslog-f7ad5aeff03833879957ef00136610d1138a7212.tar.gz rsyslog-f7ad5aeff03833879957ef00136610d1138a7212.tar.xz rsyslog-f7ad5aeff03833879957ef00136610d1138a7212.zip | |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
Diffstat (limited to 'java')
0 files changed, 0 insertions, 0 deletions