rsyslog.git/tools, branch master

Merge branch 'beta'

2012-10-18T12:36:17+00:00

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html

build: Drop unused CNF_LIBS variable

2012-10-18T10:58:04+00:00

doc: typo fix

2012-10-17T15:21:15+00:00

Merge branch 'beta'

2012-10-16T17:02:49+00:00

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html

Merge branch 'v6-stable' into beta

2012-10-16T16:59:53+00:00

Conflicts:
	rsyslog.service.in

cleanup: removed remains of -c option (compatibility mode)

2012-10-16T16:58:11+00:00

both from code & doc and emitted warning message if still used
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=361
Thanks to Michael Biebl for reporting & suggestions

Merge branch 'beta'

2012-10-11T13:38:09+00:00

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html

add deprecated note to discard action

2012-10-11T13:36:55+00:00

fix double-free

2012-10-11T09:45:05+00:00

Merge branch 'v6-devel'

2012-10-11T07:41:53+00:00

Conflicts:
	template.c