Merge branch 'v5-stable-newstats' into v5-devel v5-devel
authorRainer Gerhards <rgerhards@adiscon.com>
Thu, 12 Apr 2012 12:10:36 +0000 (14:10 +0200)
committerRainer Gerhards <rgerhards@adiscon.com>
Thu, 12 Apr 2012 12:10:36 +0000 (14:10 +0200)
commit0b8f3d5463807ae4c0a0f880b441775a51737fe8
treeb53cf11726bf73566762380f388e45c8abaa0a2f
parentc64203c7f2c886712c33c21de7e0e53b7939a883
parente4d87aac957ea639935f56fb8b03f3c03d037491
Merge branch 'v5-stable-newstats' into v5-devel
ChangeLog
doc/rsyslog_conf_global.html
plugins/imuxsock/imuxsock.c
tools/syslogd.c