diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-26 11:50:43 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-26 11:50:43 +0200 |
| commit | 7ef0821d4cc8582b01ab56d2fe304993186e40e7 (patch) | |
| tree | 735104ed5415658dfa831e03bba47a41e5ea9a43 /doc | |
| parent | 24ad305375cc6832e5b41883ad90816d723841b0 (diff) | |
| parent | 96895d9e471716f4a449589fefa9f80a0564755a (diff) | |
| download | rsyslog-7ef0821d4cc8582b01ab56d2fe304993186e40e7.tar.gz rsyslog-7ef0821d4cc8582b01ab56d2fe304993186e40e7.tar.xz rsyslog-7ef0821d4cc8582b01ab56d2fe304993186e40e7.zip | |
Merge branch 'v5-stable' into master
Conflicts:
ChangeLog
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions