summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-04-12 11:34:08 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-04-12 11:34:08 +0200
commit9105946272e4190e042981f35994b3f044ebb0d3 (patch)
tree3881710f80a8c6fa9abeca244ce378808bce409c /tools
parent0edf73f88096f3656da466027417d04ce7a2511c (diff)
parent959b777a0ae6fa01cd8d67397808008a7ce29fcd (diff)
downloadrsyslog-9105946272e4190e042981f35994b3f044ebb0d3.tar.gz
rsyslog-9105946272e4190e042981f35994b3f044ebb0d3.tar.xz
rsyslog-9105946272e4190e042981f35994b3f044ebb0d3.zip
Merge branch 'v5-stable' into v5-devel
Conflicts: ChangeLog
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions