Merge branch 'v4-stable' into v5-stable
authorRainer Gerhards <rgerhards@adiscon.com>
Sat, 14 Jan 2012 17:32:40 +0000 (18:32 +0100)
committerRainer Gerhards <rgerhards@adiscon.com>
Sat, 14 Jan 2012 17:32:40 +0000 (18:32 +0100)
commit0871d0a077c8adfdda8f055e021239dc4f354f7e
treeeb7d0a3ac4e5821b0ec8953717e49b838e062378
parenta357646ca124dbbf866606e8a48997154c40e205
parente335a65788ccb9cd381dbd28982079a914f4ae4e
Merge branch 'v4-stable' into v5-stable

Conflicts:
plugins/imfile/imfile.c
plugins/omtesting/omtesting.c
tcpsrv.c
threads.c
30 files changed:
action.h
outchannel.c
parse.c
parse.h
plugins/im3195/im3195.c
plugins/imdiag/imdiag.c
plugins/imfile/imfile.c
plugins/immark/immark.c
plugins/imrelp/imrelp.c
plugins/imtcp/imtcp.c
plugins/omlibdbi/omlibdbi.c
plugins/ommail/ommail.c
plugins/omprog/omprog.c
plugins/omrelp/omrelp.c
plugins/omsnmp/omsnmp.c
plugins/omstdout/omstdout.c
plugins/omtesting/omtesting.c
plugins/omuxsock/omuxsock.c
tcpclt.c
tcps_sess.c
tcpsrv.c
tcpsrv.h
threads.c
threads.h
tools/omdiscard.c
tools/omfile.c
tools/ompipe.c
tools/omshell.c
tools/omusrmsg.c
tools/syslogd.h