summaryrefslogtreecommitdiffstats
path: root/doc/professional_support.html
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-08-05 08:50:55 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2010-08-05 08:50:55 +0200
commitd72fe36f868ea12f246ed23bb81ece0240dd6c12 (patch)
treeec1023ab0ad27589a6f425c79855f92f7637b686 /doc/professional_support.html
parentf02d77f4b45d0a5a0ce86a87f056c91de1e4b731 (diff)
parentebba229db9d89e69b60e542e3c49f25ed9ebc6fc (diff)
downloadrsyslog-d72fe36f868ea12f246ed23bb81ece0240dd6c12.tar.gz
rsyslog-d72fe36f868ea12f246ed23bb81ece0240dd6c12.tar.xz
rsyslog-d72fe36f868ea12f246ed23bb81ece0240dd6c12.zip
Merge branch 'master' into newconf
Conflicts: doc/manual.html
Diffstat (limited to 'doc/professional_support.html')
0 files changed, 0 insertions, 0 deletions