Rainer Gerhards b11bf2745c Merge branch 'v7-stable-prifix' into v8-stable-prifix
WARNING: does not compile, will be fixed with next commit

Conflicts:
	configure.ac
	tools/rsyslogd.c
2014-09-16 14:59:14 +02:00
..