diff options
| author | Andre Lorbach <alorbach@adiscon.com> | 2011-08-18 15:41:22 +0200 |
|---|---|---|
| committer | Andre Lorbach <alorbach@adiscon.com> | 2011-08-18 15:41:22 +0200 |
| commit | 53135efb4e793da3eb94d9e42c340484192aefcf (patch) | |
| tree | 804f0b982ec849c8b0b128be8847e722ecfa5694 /java/com/rsyslog/lib/SyslogSender.java | |
| parent | 803462104b4eb319c05ea0f6e30c0b04548a1ed0 (diff) | |
| parent | 154747929f87010b444af2d552f980daafe451e6 (diff) | |
| download | rsyslog-53135efb4e793da3eb94d9e42c340484192aefcf.tar.gz rsyslog-53135efb4e793da3eb94d9e42c340484192aefcf.tar.xz rsyslog-53135efb4e793da3eb94d9e42c340484192aefcf.zip | |
Merge branch 'v5-stable' into v5-devel
Conflicts:
configure.ac
Diffstat (limited to 'java/com/rsyslog/lib/SyslogSender.java')
0 files changed, 0 insertions, 0 deletions