Merge branch 'v5-stable' into v5-devel
authorRainer Gerhards <rgerhards@adiscon.com>
Thu, 1 Mar 2012 11:25:39 +0000 (12:25 +0100)
committerRainer Gerhards <rgerhards@adiscon.com>
Thu, 1 Mar 2012 11:25:39 +0000 (12:25 +0100)
commit115718de967f673fc89ce8b8be1b16081ca4dde1
tree31c8ba575f8db55ea7f769d9b1907c65bcc6aa12
parentaafa9b41a5f06b88f11df5c837427e171e1048d7
parentc2970de8b0dd07c52f3a107e5ec3de55010c9999
Merge branch 'v5-stable' into v5-devel

Conflicts:
ChangeLog
plugins/imklog/imklog.c
plugins/imklog/imklog.h
ChangeLog
plugins/imklog/imklog.c
plugins/imklog/imklog.h
runtime/conf.c
runtime/rsyslog.h