Merge branch 'v4-stable' into v5-stable
authorRainer Gerhards <rgerhards@adiscon.com>
Fri, 27 Jan 2012 11:50:19 +0000 (12:50 +0100)
committerRainer Gerhards <rgerhards@adiscon.com>
Fri, 27 Jan 2012 11:50:19 +0000 (12:50 +0100)
commit2c172dcf820ade9665ecec2359de4fcdfd3f080f
tree9dc0695f789914b2434984ed6b198940693b3e34
parentb029d4751ac77f7ee4c7035c522e6c85601035c1
parentcbb9684731c1d56dbe3622141f397f3afbb0f6dc
Merge branch 'v4-stable' into v5-stable
ChangeLog
plugins/imklog/imklog.c
plugins/omprog/omprog.c
runtime/conf.c
runtime/rsyslog.h
runtime/unlimited_select.h