diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-07-11 15:46:59 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-07-11 15:46:59 +0200 |
| commit | 0b7eaa413a58aa3d92e9c4f384029c9393e00250 (patch) | |
| tree | d2b440a10c4fb468d9afbc548bbe74b842dac606 /rsyslog.conf | |
| parent | 82c8077b91ab5c1928b3d712d3ab61e4041c461d (diff) | |
| parent | 84f7dd2bdc2356bdc9f5893a78adb4d00c21f750 (diff) | |
| download | rsyslog-0b7eaa413a58aa3d92e9c4f384029c9393e00250.tar.gz rsyslog-0b7eaa413a58aa3d92e9c4f384029c9393e00250.tar.xz rsyslog-0b7eaa413a58aa3d92e9c4f384029c9393e00250.zip | |
Merge branch 'v3-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'rsyslog.conf')
0 files changed, 0 insertions, 0 deletions