diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-10 14:58:07 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-10 14:58:07 +0200 |
commit | 48b8ea8137ecc803b3a3f5ce1fd418f491675c08 (patch) | |
tree | 150c8a121939c7698fc515a29e9aa04b512a5e74 /doc | |
parent | 6625450cbeee6cd4dc0ecc7418e552833708e95c (diff) | |
parent | 68f7a7bfd21a63c6b3f753341ac48a8873a260a7 (diff) | |
download | rsyslog-48b8ea8137ecc803b3a3f5ce1fd418f491675c08.tar.gz rsyslog-48b8ea8137ecc803b3a3f5ce1fd418f491675c08.tar.xz rsyslog-48b8ea8137ecc803b3a3f5ce1fd418f491675c08.zip |
Merge branch 'v6-stable'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions