summaryrefslogtreecommitdiffstats
path: root/NEWS
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-06-27 12:03:01 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-06-27 12:03:01 +0200
commitbfdca9ea1835492bec363a36014f6c43bb1e8a56 (patch)
tree76b4ea35ed5cdf4ae79f7d52216327f773b810ce /NEWS
parent2cccec9a9ff5a5d1b0db6f869a525c4b3c601c33 (diff)
parent6812fceef4f955610e6075c798f729e7a0617b24 (diff)
downloadrsyslog-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