diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-03 18:33:29 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-03 18:33:29 +0200 |
commit | e53ef769dd5eaf6399d2dfc467a29d9295aa1d73 (patch) | |
tree | 53d60d77fb1419ba0a497aca842f2f884d164efd /tools | |
parent | 99d9c6d52ced294dee2822d36ede069c2bd37044 (diff) | |
parent | 4f70113457993c536fc948d5b3b3e69dc7a92a8a (diff) | |
download | rsyslog-e53ef769dd5eaf6399d2dfc467a29d9295aa1d73.tar.gz rsyslog-e53ef769dd5eaf6399d2dfc467a29d9295aa1d73.tar.xz rsyslog-e53ef769dd5eaf6399d2dfc467a29d9295aa1d73.zip |
Merge branch 'v6-stable'
Conflicts:
tools/syslogd.c
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions