diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-30 12:46:57 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-30 12:46:57 +0100 |
commit | 8c20add150be92822d2484822b18ead9fd29ac1d (patch) | |
tree | 104de50208b8da7de474f6a046dbc24496118d34 /m4 | |
parent | 6598615e5bb4e69b9802cf47b1125ce822873ef8 (diff) | |
parent | 3fd95bfb5d522adb2e913becc94b272228469d99 (diff) | |
download | rsyslog-8c20add150be92822d2484822b18ead9fd29ac1d.tar.gz rsyslog-8c20add150be92822d2484822b18ead9fd29ac1d.tar.xz rsyslog-8c20add150be92822d2484822b18ead9fd29ac1d.zip |
Merge branch 'beta'
Conflicts:
ChangeLog
Diffstat (limited to 'm4')
0 files changed, 0 insertions, 0 deletions