diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-27 12:03:01 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-27 12:03:01 +0200 |
commit | bfdca9ea1835492bec363a36014f6c43bb1e8a56 (patch) | |
tree | 76b4ea35ed5cdf4ae79f7d52216327f773b810ce /NEWS | |
parent | 2cccec9a9ff5a5d1b0db6f869a525c4b3c601c33 (diff) | |
parent | 6812fceef4f955610e6075c798f729e7a0617b24 (diff) | |
download | rsyslog-bfdca9ea1835492bec363a36014f6c43bb1e8a56.tar.gz rsyslog-bfdca9ea1835492bec363a36014f6c43bb1e8a56.tar.xz rsyslog-bfdca9ea1835492bec363a36014f6c43bb1e8a56.zip |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
Diffstat (limited to 'NEWS')
0 files changed, 0 insertions, 0 deletions