rsyslog.git/plugins/mmsnmptrapd, branch v6.3.2

Merge branch 'v5-devel'

2011-06-27T10:33:26+00:00

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/imfile/imfile.c
	plugins/imklog/imklog.c
	plugins/imptcp/imptcp.c
	plugins/imtcp/imtcp.c
	plugins/imuxsock/imuxsock.c
	plugins/mmsnmptrapd/mmsnmptrapd.c
	tools/omfile.c

Merge branch 'v5-stable-imfile-batches' into v5-devel

2011-06-06T07:17:27+00:00

Conflicts:
	ChangeLog
	configure.ac

Merge branch 'v5-stable' into beta

2011-05-20T09:48:17+00:00

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	doc/rsyslog_conf_modules.html
	plugins/imrelp/imrelp.c

mmsnmptrapd: doc bugfix and fix issue with config stmt handler

2011-05-13T12:11:34+00:00

mmsnmptrapd: removed unnecessary includes

2011-05-11T23:58:46+00:00

cosmetic cleanup

2011-05-09T10:06:32+00:00

mmsnmptrapd: added capability to specify severity mapping

2011-05-09T09:37:26+00:00

mmsnmptrap: added TAG processing

2011-05-06T06:11:44+00:00

added skeleton for mmsnmptrapd

2011-05-05T10:19:58+00:00