rsyslog.git/doc, branch v6.3.2

preparing for 6.3.2

2011-07-06T07:43:42+00:00

Merge branch 'beta'

2011-07-06T06:46:35+00:00

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	runtime/rsyslog.h

Merge branch 'v5-stable' into beta

2011-07-06T06:36:58+00:00

Conflicts:
	ChangeLog
	doc/manual.html

Merge branch 'v4-stable' into v5-stable

2011-07-06T06:07:04+00:00

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html

added support for the ":omusrmsg:" syntax in configuring user messages

2011-07-06T05:52:50+00:00

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

preparing for 4.6.6

2011-06-24T06:42:39+00:00

prepare for 6.1.10

2011-06-22T08:27:20+00:00

Merge branch 'beta'

2011-06-21T14:11:58+00:00

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	tests/Makefile.am
	tests/manytcp-too-few-tls.sh

Merge branch 'v5-stable' into beta

2011-06-21T13:42:11+00:00

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	tests/diag.sh
	tests/sndrcv_drvr.sh