diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-11-25 14:47:21 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-11-25 14:47:21 +0100 |
| commit | 65c7f4689387d61c55280ac9f2aea0317d5b8ee2 (patch) | |
| tree | 3efb2270f683ed897c6d5f3c4b4919a4c567f919 /java/com | |
| parent | e4ac19d8ff2a7ef7698048e7c732f4e404f007b8 (diff) | |
| parent | 40814bb0307f9d8536b3dc4a28b94f80a361b41d (diff) | |
| download | rsyslog-65c7f4689387d61c55280ac9f2aea0317d5b8ee2.tar.gz rsyslog-65c7f4689387d61c55280ac9f2aea0317d5b8ee2.tar.xz rsyslog-65c7f4689387d61c55280ac9f2aea0317d5b8ee2.zip | |
Merge branch 'v5.6.0a' into v5-stable
Conflicts:
configure.ac
Diffstat (limited to 'java/com')
0 files changed, 0 insertions, 0 deletions