diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-22 20:18:58 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-22 20:18:58 +0200 |
| commit | aa0701b100084d61df6fff10be48bb088f551932 (patch) | |
| tree | 24acb326dccf074331b9556e959df72ae6307bef /java | |
| parent | 87472f58b4cd47762a7b134f0d8521cabc739cae (diff) | |
| parent | 096db025e2c06045226f9f3c70386e3394d60bb2 (diff) | |
| download | rsyslog-aa0701b100084d61df6fff10be48bb088f551932.tar.gz rsyslog-aa0701b100084d61df6fff10be48bb088f551932.tar.xz rsyslog-aa0701b100084d61df6fff10be48bb088f551932.zip | |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'java')
0 files changed, 0 insertions, 0 deletions