summaryrefslogtreecommitdiffstats
path: root/NEWS
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-03-16 15:08:53 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2011-03-16 15:08:53 +0100
commit2fc70320e303fd02b29469416a709a1f8ee4374d (patch)
tree9de5d8b20ad8d6e7a6d85c559056a68a68adff1e /NEWS
parent33366f2f1e271f47edeed75f69d9885171e61ea0 (diff)
parent9e18ecc9bd14093b78199fd36c315cfce4d26a26 (diff)
downloadrsyslog-2fc70320e303fd02b29469416a709a1f8ee4374d.tar.gz
rsyslog-2fc70320e303fd02b29469416a709a1f8ee4374d.tar.xz
rsyslog-2fc70320e303fd02b29469416a709a1f8ee4374d.zip
Merge branch 'v5-stable' into v5-beta
Conflicts: tests/Makefile.am
Diffstat (limited to 'NEWS')
0 files changed, 0 insertions, 0 deletions