Merge branch 'v5-stable-newstats' into v5-devel
authorRainer Gerhards <rgerhards@adiscon.com>
Sat, 7 Apr 2012 12:44:12 +0000 (14:44 +0200)
committerRainer Gerhards <rgerhards@adiscon.com>
Sat, 7 Apr 2012 12:44:12 +0000 (14:44 +0200)
commitd53016962da179c52ad22600bd54ffd58f86a81c
treef557da4c02f73f13df76347078d7bc2388fdd89d
parentcacb817fa3f6b78bad9e13f56d0fa1ed7d0366c1
parentbd8d972a975ce794dd71c1c8db724991dd4744a0
Merge branch 'v5-stable-newstats' into v5-devel

Conflicts:
configure.ac
doc/manual.html
ChangeLog
action.c
doc/rsyslog_conf_global.html
plugins/imklog/imklog.c
plugins/imuxsock/imuxsock.c
runtime/queue.c
tools/syslogd.c